-/*
- relative-music.cc -- implement Relative_octave_music
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "relative-music.hh"
+/*
+ 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 "scm-option.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)
{
lily_1_8_compatibility_used = true;
- /* ugh: last-pitch should be junked.
+ /* last-pitch should be junked some time, when
+ we ditch 1.8 compat too.
- Change this for lilypond 2.0.
+ When you do, B should start where A left off.
- FIXME: change WHAT? We're at 2.3 already -- jcn
-
- When you do, B should start where A left off.
-
- \relative { A \relative { ...} B } */
- return *unsmob_pitch (get_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);
-
-