X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=28a562bdc8d6c63bb6a4e0a4bf0e5d1b0ed21c1a;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=0815d49b8c07d841065c8b6d9bb8523cadc17331;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 0815d49b8c..28a562bdc8 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "pitch.hh"
-
 #include "warn.hh"
 #include "main.hh"
 
@@ -32,7 +31,7 @@ Pitch::Pitch ()
 int
 Pitch::compare (Pitch const &m1, Pitch const &m2)
 {
-  int o=  m1.octave_ - m2.octave_;
+  int o =  m1.octave_ - m2.octave_;
   int n = m1.notename_ - m2.notename_;
   int a = m1.alteration_ - m2.alteration_;
 
@@ -158,7 +157,7 @@ pitch_interval (Pitch const & from , Pitch const & to )
 
 	    to.get_alteration () - from.get_alteration ());
 
-  return pt.transposed (Pitch (0,0,sound - pt.quartertone_pitch ()));
+  return pt.transposed (Pitch (0, 0, sound - pt.quartertone_pitch ()));
 }
 
 
@@ -185,7 +184,7 @@ Pitch::to_string () const
     {
       int o = (-octave_) - 1;
       while (o--)
-	s += ::to_string (',');
+	s += ::to_string (', ');
     }
 
   return s;
@@ -234,18 +233,6 @@ Pitch::down_to (int notename)
   notename_ = notename;
 }
 
-LY_DEFINE (ly_pitch_transpose, "ly:pitch-transpose",
-	   2, 0, 0, (SCM p, SCM delta),
-	   "Transpose @var{p} by the amount @var{delta}, "
-	   "where @var{delta} is relative to middle C.")
-{
-  Pitch* t = unsmob_pitch (p);
-  Pitch *d = unsmob_pitch (delta);
-  SCM_ASSERT_TYPE (t, p, SCM_ARG1, __FUNCTION__, "pitch");
-  SCM_ASSERT_TYPE (d, delta, SCM_ARG1, __FUNCTION__, "pitch");
-  return t->transposed (*d).smobbed_copy ();
-}
-
 IMPLEMENT_TYPE_P (Pitch, "ly:pitch?");
 
 SCM
@@ -278,6 +265,7 @@ Pitch::equal_p (SCM a , SCM b)
   return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
+
 MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
 SCM
 Pitch::less_p (SCM p1, SCM p2)
@@ -291,112 +279,6 @@ Pitch::less_p (SCM p1, SCM p2)
     return SCM_BOOL_F;
 }
 
-/* Should add optional args.  */
-LY_DEFINE (ly_make_pitch, "ly:make-pitch",
-	   3, 0, 0, (SCM octave, SCM note, SCM alter),
-	   "@var{octave} is specified by an integer, "
-	   "zero for the octave containing middle C.  "
-	   "@var{note} is a number from 0 to 6, "
-	   "with 0 corresponding to C and 6 corresponding to B.  "
-	   "The @var{alter} is zero for a natural, negative for "
-	   "flats, or positive for sharps. ")
-{
-  SCM_ASSERT_TYPE (scm_integer_p (octave)== SCM_BOOL_T , octave, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (note)== SCM_BOOL_T, note, SCM_ARG2, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE (scm_integer_p (alter)== SCM_BOOL_T, alter, SCM_ARG3, __FUNCTION__, "integer");
-
-  Pitch p (scm_to_int (octave), scm_to_int (note), scm_to_int (alter));
-  return p.smobbed_copy ();
-}
-
-LY_DEFINE (ly_pitch_steps, "ly:pitch-steps", 1, 0, 0,
-	   (SCM p),
-	   "Number of steps counted from middle C of the pitch @var{p}.")
-{
-  Pitch *pp = unsmob_pitch (p);
-  SCM_ASSERT_TYPE (pp, p, SCM_ARG1, __FUNCTION__, "Pitch");
-  return scm_int2num (pp->steps ());
-}
-
-LY_DEFINE (ly_pitch_octave, "ly:pitch-octave",
-	   1, 0, 0, (SCM pp),
-	   "Extract the octave from pitch @var{p}.")
-{
-  Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->get_octave ();
-  return scm_int2num (q);
-}
-
-LY_DEFINE (ly_pitch_alteration, "ly:pitch-alteration",
-	   1, 0, 0, (SCM pp),
-	   "Extract the alteration from pitch  @var{p}.")
-{
-  Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->get_alteration ();
-
-  return scm_int2num (q);
-}
-
-LY_DEFINE (pitch_notename, "ly:pitch-notename",
-	   1, 0, 0, (SCM pp),
-	   "Extract the note name from pitch  @var{pp}.")
-{
-  Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->get_notename ();
-  return scm_int2num (q);
-}
-
-LY_DEFINE (ly_pitch_quartertones, "ly:pitch-quartertones",
-	   1, 0, 0, (SCM pp),
-	   "Calculate the number of quarter tones of @var{p} from middle C.")
-{
-  Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->quartertone_pitch ();
-  return scm_int2num (q);
-}
-
-LY_DEFINE (ly_pitch_semitones, "ly:pitch-semitones",
-	   1, 0, 0, (SCM pp),
-	   "calculate the number of semitones of @var{p} from middle C.")
-{
-  Pitch *p = unsmob_pitch (pp);
-  SCM_ASSERT_TYPE (p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
-  int q = p->semitone_pitch ();
-  return scm_int2num (q);
-}
-
-LY_DEFINE (ly_pitch_less_p, "ly:pitch<?",
-	   2, 0, 0, (SCM p1, SCM p2),
-	   "Is @var{p1} lexicographically smaller than @var{p2}?")
-{
-  Pitch *a = unsmob_pitch (p1);
-  Pitch *b = unsmob_pitch (p2);
-
-  SCM_ASSERT_TYPE (a, p1, SCM_ARG1, __FUNCTION__, "Pitch");
-  SCM_ASSERT_TYPE (b, p2, SCM_ARG2, __FUNCTION__, "Pitch");
-
-  if (Pitch::compare (*a, *b) < 0)
-    return SCM_BOOL_T;
-  else
-    return SCM_BOOL_F;
-}
-
-LY_DEFINE (ly_pitch_diff, "ly:pitch-diff",
-	   2 ,0, 0, (SCM pitch, SCM  root),
-	   "Return pitch @var{delta} such that @code{pitch} transposed by "
-	   "@var{delta} equals @var{root}" )
-{
-  Pitch *p = unsmob_pitch (pitch);
-  Pitch *r = unsmob_pitch (root);
-  SCM_ASSERT_TYPE (p, pitch, SCM_ARG1, __FUNCTION__, "Pitch");
-  SCM_ASSERT_TYPE (r, root, SCM_ARG2, __FUNCTION__, "Pitch");
-
-  return pitch_interval (*r, *p).smobbed_copy ();
-}
 
 int
 Pitch::get_octave () const