* buildscripts/gen-emmentaler-scripts.py (outdir): capitalize

[lilypond.git] / lily / relative-octave-music.cc

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index f786e7b0edcbd9e590c18a8d4fb00b2a5e4b9bec..a6421659a0b8de924fb9e83c989854d0dc5bf2a1 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -3,31 +3,51 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "relative-music.hh"
-#include "debug.hh"
+#include "music.hh"
+#include "pitch.hh"
+#include "warn.hh"
+#include "scm-option.hh"
 
-Musical_pitch
-Relative_octave_music::to_relative_octave (Musical_pitch)
-{
-  return last_pitch_;
-}
 
+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 ()->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;
 }