X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=52efa5098c51d7d2665cdae964518c3e3364af8b;hb=fd565020849c9cd24d4e7ce47c50f756198a44c9;hp=15c9c54566945626afad332e67501100e3069d49;hpb=237583408aaf3b2192c388c3183d9c57fb051bd0;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 15c9c54566..52efa5098c 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,41 +1,46 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "relative-music.hh"
-#include "warn.hh"
+/*
+  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.
 
-Pitch
-Relative_octave_music::to_relative_octave (Pitch p)
+  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 "warn.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));
+};
+
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
+SCM
+Relative_octave_music::no_relative_callback (SCM /* music */,
+                                             SCM pitch)
 {
-  if (lily_1_8_relative)
-    {
-      
-  /*
-    ugh: last-pitch should  be junked.
-
-    Change this for lilypond 2.0. When you do,
-    then B should start where A left off.
-
-    \relative { A \relative { ...} B }
-
-  */
-      return * unsmob_pitch (get_mus_property ("last-pitch"));
-    }
-  else
-    return p;
+  return pitch;
 }
 
-
-Relative_octave_music::Relative_octave_music ()
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+SCM
+Relative_octave_music::relative_callback (SCM /* music */,
+                                          SCM pitch)
 {
+  return pitch;
 }
 
-ADD_MUSIC (Relative_octave_music);