-/*
- 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"
-
-Pitch
-Relative_octave_music::to_relative_octave (Pitch)
-{
- return * unsmob_pitch (get_mus_property ("last-pitch"));
-}
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+
+ Copyright (C) 1998--2012 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.
+
+ 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"
-Relative_octave_music::Relative_octave_music(Music*p,Pitch def)
- : Music_wrapper (p)
+class Relative_octave_music
{
- set_mus_property ("last-pitch", element ()->to_relative_octave (def).smobbed_copy ());
- set_mus_property ("type", ly_symbol2scm ("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;
}
+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)
+ {
+ 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;
+}