X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=bf6116ab17036e8b69ab2c263053320662bf121a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e2552b65a819fd50c9be45c4dd1e0f04b709e1d3;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index e2552b65a8..bf6116ab17 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,33 +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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "relative-music.hh"
-#include "debug.hh"
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Musical_pitch
-Relative_octave_music::to_relative_octave (Musical_pitch)
-{
-  return last_pitch_;
-}
+#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));
+};
 
-Relative_octave_music::Relative_octave_music(Music*p,Musical_pitch def)
-  : Music_wrapper (p)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
+  SCM
+Relative_octave_music::no_relative_callback (SCM music, SCM pitch)
 {
-  last_pitch_ = element_l ()->to_relative_octave (def);
+  (void)music;
+  return pitch;
 }
 
-void
-Relative_octave_music::do_print () const
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+  SCM
+Relative_octave_music::relative_callback (SCM music, SCM pitch)
 {
-  Music_wrapper::do_print ();
-  DEBUG_OUT << "default pitch: " << last_pitch_.str ();
-}
+  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;
+}