X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-check.cc;fp=lily%2Frelative-octave-check.cc;h=91360f52b1ccb6f1eb93fccd1489116181cffb0b;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=bb597f97cb5b2da65cae30a0a4fed57c1c8c323e;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc index bb597f97cb..91360f52b1 100644 --- a/lily/relative-octave-check.cc +++ b/lily/relative-octave-check.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--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 @@ -28,7 +28,7 @@ public: }; MAKE_SCHEME_CALLBACK (Relative_octave_check, relative_callback, 2) - SCM +SCM Relative_octave_check::relative_callback (SCM music, SCM last_pitch) { Pitch p = *unsmob_pitch (last_pitch); @@ -39,23 +39,23 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch) if (check_p) { Pitch no_octave (-1, - check_p->get_notename (), - check_p->get_alteration ()); + check_p->get_notename (), + check_p->get_alteration ()); Pitch result = no_octave.to_relative_octave (p); if (result != *check_p) - { - string s = _ ("Failed octave check, got: "); - s += result.to_string (); + { + string s = _ ("Failed octave check, got: "); + s += result.to_string (); - m->origin ()->warning (s); + m->origin ()->warning (s); - delta_oct = check_p->get_octave () - result.get_octave (); - } + delta_oct = check_p->get_octave () - result.get_octave (); + } } return Pitch (p.get_octave () + delta_oct, - p.get_notename (), - p.get_alteration ()).smobbed_copy (); + p.get_notename (), + p.get_alteration ()).smobbed_copy (); }