/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2015 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
};
MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
- SCM
+SCM
Relative_octave_music::no_relative_callback (SCM /* music */,
- SCM pitch)
+ SCM pitch)
{
return pitch;
}
MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
- SCM
-Relative_octave_music::relative_callback (SCM music, SCM pitch)
+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;
+ return pitch;
}