X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=94f566357c5cf5eeb9831ade241834b77e76514d;hb=f80d5f1d8ff079cc14810efca44e109f2de977d1;hp=39467959cd9be47cba078368bd49b746acc0e4d6;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 39467959cd..94f566357c 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,34 +1,42 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  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 "pitch.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));
+  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)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
 SCM
-Relative_octave_music::no_relative_callback (SCM music, SCM pitch)
+Relative_octave_music::no_relative_callback (SCM /* music */,
+                                             SCM pitch)
 {
-  (void)music;
   return pitch;
 }
 
-MAKE_SCHEME_CALLBACK(Relative_octave_music,relative_callback,2)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
 SCM
 Relative_octave_music::relative_callback (SCM music, SCM pitch)
 {
@@ -37,17 +45,16 @@ 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;
+      return (ptr) ? last_pitch : pitch;
     }
   else
     return pitch;
 }
 
-