Imported Upstream version 2.14.2

[lilypond.git] / lily / relative-octave-music.cc

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index ef090a9ef7c56ecefe930bce900afbfff21f78c4..6c23ac3ed7755428cf7a86ed577e9f702d304755 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,35 +1,43 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2011 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)
-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 +47,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;
 }
 
-