X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=94f566357c5cf5eeb9831ade241834b77e76514d;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=6c23ac3ed7755428cf7a86ed577e9f702d304755;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index 6c23ac3ed7..94f566357c 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Han-Wen Nienhuys + Copyright (C) 1998--2012 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 @@ -29,15 +29,15 @@ public: }; 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 +SCM Relative_octave_music::relative_callback (SCM music, SCM pitch) { Music *me = unsmob_music (music); @@ -45,11 +45,11 @@ Relative_octave_music::relative_callback (SCM music, SCM pitch) { lily_1_8_compatibility_used = true; /* last-pitch should be junked some time, when - we ditch 1.8 compat too. + we ditch 1.8 compat too. - When you do, B should start where A left off. + When you do, B should start where A left off. - \relative { A \relative { ...} B } */ + \relative { A \relative { ...} B } */ SCM last_pitch = me->get_property ("last-pitch"); Pitch *ptr = unsmob_pitch (last_pitch); return (ptr) ? last_pitch : pitch;