X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=52efa5098c51d7d2665cdae964518c3e3364af8b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=ef090a9ef7c56ecefe930bce900afbfff21f78c4;hpb=108c107d70a3cc48efd9f734a153ff82aac8fbb4;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index ef090a9ef7..52efa5098c 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,53 +1,46 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  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.hh"
-#include "pitch.hh"
 #include "warn.hh"
-#include "scm-option.hh"
-
+#include "program-option.hh"
 
 class Relative_octave_music
 {
 public:
-  DECLARE_SCHEME_CALLBACK(relative_callback,(SCM,SCM));
-  DECLARE_SCHEME_CALLBACK(no_relative_callback,(SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (no_relative_callback, (SCM, SCM));
 };
 
-MAKE_SCHEME_CALLBACK(Relative_octave_music,no_relative_callback,2)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
 SCM
-Relative_octave_music::no_relative_callback (SCM music, SCM pitch)
+Relative_octave_music::no_relative_callback (SCM /* music */,
+                                             SCM pitch)
 {
-  (void)music;
   return pitch;
 }
 
-MAKE_SCHEME_CALLBACK(Relative_octave_music,relative_callback,2)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
 SCM
-Relative_octave_music::relative_callback (SCM music, SCM pitch)
+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;
 }
 
-