X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=52efa5098c51d7d2665cdae964518c3e3364af8b;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=a04b735cbf5fae3d87221557f31eab6534141297;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index a04b735cbf..52efa5098c 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -1,15 +1,25 @@ /* - relative-music.cc -- implement Relative_octave_music + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2015 Han-Wen Nienhuys - (c) 1998--2005 Han-Wen Nienhuys + 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 . */ #include "music.hh" -#include "pitch.hh" #include "warn.hh" -#include "scm-option.hh" +#include "program-option.hh" class Relative_octave_music { @@ -19,32 +29,18 @@ public: }; MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2) - SCM -Relative_octave_music::no_relative_callback (SCM music, SCM pitch) +SCM +Relative_octave_music::no_relative_callback (SCM /* music */, + SCM pitch) { - (void)music; 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; }