Run grand-replace (issue 3765)

[lilypond.git] / lily / include / pitch.hh

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index 676a30c093f8d7811a251e6a3b2177401490ee91..cab0c5092202a2b46f4b2b9cc2c96a89c66039c7 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2014 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
@@ -17,22 +17,21 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MUSICAL_PITCH_HH
-#define MUSICAL_PITCH_HH
+#ifndef PITCH_HH
+#define PITCH_HH
 
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "rational.hh"
 
+/*
+  A "tonal" pitch.  This is a pitch used in diatonal western music
+  (24 quartertones in an octave), as opposed to a frequency in Hz or a
+  integer number of semitones.
 
-/** A "tonal" pitch. This is a pitch used in diatonal western music
-    (24 quartertones in an octave), as opposed to a frequency in Hz or a
-    integer number of semitones.
-
-    Pitch is lexicographically ordered by (octave, notename,
-    alteration).
-
+  Pitch is lexicographically ordered by (octave, notename, alteration).
 */
+
 class Pitch
 {
 private:
@@ -60,6 +59,8 @@ public:
   Pitch transposed (Pitch) const;
   Pitch to_relative_octave (Pitch) const;
 
+  Pitch normalized () const;
+
   static int compare (Pitch const &, Pitch const &);
 
   int steps () const;
@@ -73,8 +74,8 @@ public:
   DECLARE_SIMPLE_SMOBS (Pitch);
 };
 
-
-enum {
+enum
+{
   DOUBLE_FLAT = -4,
   THREE_Q_FLAT,
   FLAT,
@@ -86,15 +87,15 @@ enum {
   DOUBLE_SHARP,
 };
 
-extern Rational  DOUBLE_FLAT_ALTERATION;
-extern Rational  THREE_Q_FLAT_ALTERATION;
-extern Rational  FLAT_ALTERATION;
-extern Rational  SEMI_FLAT_ALTERATION;
-extern Rational  NATURAL_ALTERATION;
-extern Rational  SEMI_SHARP_ALTERATION;
-extern Rational  SHARP_ALTERATION;
-extern Rational  THREE_Q_SHARP_ALTERATION;
-extern Rational  DOUBLE_SHARP_ALTERATION;
+extern Rational DOUBLE_FLAT_ALTERATION;
+extern Rational THREE_Q_FLAT_ALTERATION;
+extern Rational FLAT_ALTERATION;
+extern Rational SEMI_FLAT_ALTERATION;
+extern Rational NATURAL_ALTERATION;
+extern Rational SEMI_SHARP_ALTERATION;
+extern Rational SHARP_ALTERATION;
+extern Rational THREE_Q_SHARP_ALTERATION;
+extern Rational DOUBLE_SHARP_ALTERATION;
 
 SCM ly_pitch_diff (SCM pitch, SCM root);
 SCM ly_pitch_transpose (SCM p, SCM delta);
@@ -104,6 +105,6 @@ INSTANTIATE_COMPARE (Pitch, Pitch::compare);
 
 extern SCM pitch_less_proc;
 Pitch pitch_interval (Pitch const &from, Pitch const &to);
+extern SCM Pitch_type_p_proc;
 
-#endif /* MUSICAL_PITCH_HH */
-
+#endif /* PITCH_HH */