-/*
- relative-music.cc -- implement Relative_octave_music
-
+/*
+ relative-music.cc -- implement Relative_octave_music
+
source file of the GNU LilyPond music typesetter
-
- (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "relative-music.hh"
-#include "debug.hh"
+ (c) 1998--2009 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"
-Music_iterator*
-Relative_octave_music::to_rhythm (Music_iterator* r)
+class Relative_octave_music
{
- return element_l ()->to_rhythm (r);
-}
+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);
+ 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 ();
- DOUT << "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;
+}