Run `make grand-replace'.

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

diff --git a/lily/relative-octave-check.cc b/lily/relative-octave-check.cc
index f7a81a78d105e3dd91cf9e33c6eeb134a45a8100..8f997ee81a988ad14a0bf6df0a4b6d130f69ba79 100644 (file)
--- a/lily/relative-octave-check.cc
+++ b/lily/relative-octave-check.cc
@@ -1,31 +1,29 @@
 /*
-  relative-octave-check.cc --  implement Relative_octave_check
+  relative-octave-check.cc -- implement Relative_octave_check
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "input.hh"
-#include "pitch.hh"
+#include "international.hh"
+#include "music.hh"
 
 class Relative_octave_check
 {
 public:
-  DECLARE_SCHEME_CALLBACK(relative_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
 };
 
-
-MAKE_SCHEME_CALLBACK(Relative_octave_check, relative_callback, 2)
-SCM
+MAKE_SCHEME_CALLBACK (Relative_octave_check, relative_callback, 2)
+  SCM
 Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 {
   Pitch p = *unsmob_pitch (last_pitch);
-  Music *m = unsmob_music (music); 
+  Music *m = unsmob_music (music);
   Pitch *check_p = unsmob_pitch (m->get_property ("pitch"));
-  
+
   int delta_oct = 0;
   if (check_p)
     {
@@ -37,15 +35,16 @@ Relative_octave_check::relative_callback (SCM music, SCM last_pitch)
 
       if (result != *check_p)
        {
-         String s = _("Failed octave check, got: ");
+         string s = _ ("Failed octave check, got: ");
          s += result.to_string ();
-         
+
          m->origin ()->warning (s);
-         
+
          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 ();
 }