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

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 15c9c54566..cbd7969fed 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,41 +1,49 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
+/*
+  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"
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#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)
+{
+  return pitch;
+}
 
-Pitch
-Relative_octave_music::to_relative_octave (Pitch p)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+  SCM
+Relative_octave_music::relative_callback (SCM music, SCM pitch)
 {
+  Music *me = unsmob_music (music);
   if (lily_1_8_relative)
     {
-      
-  /*
-    ugh: last-pitch should  be junked.
+      lily_1_8_compatibility_used = true;
+      /*  last-pitch should be junked some time, when
+	  we ditch 1.8 compat too.
 
-    Change this for lilypond 2.0. When you do,
-    then B should start where A left off.
+	  When you do, B should start where A left off.
 
-    \relative { A \relative { ...} B }
-
-  */
-      return * unsmob_pitch (get_mus_property ("last-pitch"));
+	  \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 p;
-}
-
-
-Relative_octave_music::Relative_octave_music ()
-{
+    return pitch;
 }
 
-ADD_MUSIC (Relative_octave_music);