X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=cbd7969fede54fffeca0f1c7871407e894c95ce2;hb=037dfabec2317c60d2f0c9b2d48cb16248e6fff2;hp=01ddcc0b37f720b28f60daa04519b84d90f665c7;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index 01ddcc0b37..cbd7969fed 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,35 +1,32 @@
-/*   
+/*
   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>
-  
- */
+
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #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)
-SCM
-Relative_octave_music::no_relative_callback (SCM music, SCM pitch)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
+  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
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+  SCM
 Relative_octave_music::relative_callback (SCM music, SCM pitch)
 {
   Music *me = unsmob_music (music);
@@ -39,15 +36,14 @@ Relative_octave_music::relative_callback (SCM music, SCM pitch)
       /*  last-pitch should be junked some time, when
 	  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;
 }
 
-