X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=ee03ac44d8db2e53a782e0732acb766e23b6914a;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=e9872fdf8eb09ba8e9bb534b52644583b7ef2744;hpb=3b870eb9ab448ebc11a2d6283ad35796b22351aa;p=lilypond.git

diff --git a/lily/pitch.cc b/lily/pitch.cc
index e9872fdf8e..ee03ac44d8 100644
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -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--2015 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
@@ -24,15 +24,14 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
-
+#include <cmath>
 
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;
   alteration_ = a;
   octave_ = o;
-  scale_ = default_global_scale; 
+  scale_ = default_global_scale;
   normalize_octave ();
 }
 
@@ -40,8 +39,9 @@ Pitch::Pitch (int o, int n, Rational a)
 Pitch::Pitch ()
 {
   notename_ = 0;
-  scale_ = default_global_scale; 
+  scale_ = default_global_scale;
   octave_ = 0;
+  alteration_ = (Rational)0;
 }
 
 int
@@ -56,8 +56,8 @@ Pitch::compare (Pitch const &m1, Pitch const &m2)
   if (n)
     return n;
   if (a)
-    return a;
-  
+    return a > (Rational)0 ? 1 : -1;
+
   return 0;
 }
 
@@ -78,13 +78,13 @@ Pitch::tone_pitch () const
 int
 Pitch::rounded_semitone_pitch () const
 {
-  return int (double (tone_pitch () * Rational (2)));
+  return int (floor (double (tone_pitch () * Rational (2) + Rational (1, 2))));
 }
 
 int
 Pitch::rounded_quartertone_pitch () const
 {
-  return int (double (tone_pitch () * Rational (4)));
+  return int (floor (double (tone_pitch () * Rational (4) + Rational (1, 2))));
 }
 
 void
@@ -137,9 +137,9 @@ pitch_interval (Pitch const &from, Pitch const &to)
 {
   Rational sound = to.tone_pitch () - from.tone_pitch ();
   Pitch pt (to.get_octave () - from.get_octave (),
-	    to.get_notename () - from.get_notename (),
+            to.get_notename () - from.get_notename (),
 
-	    to.get_alteration () - from.get_alteration ());
+            to.get_alteration () - from.get_alteration ());
 
   return pt.transposed (Pitch (0, 0, sound - pt.tone_pitch ()));
 }
@@ -147,14 +147,15 @@ pitch_interval (Pitch const &from, Pitch const &to)
 /* FIXME
    Merge with *pitch->text* funcs in chord-name.scm  */
 char const *accname[] = {"eses", "eseh", "es", "eh", "",
-			 "ih", "is", "isih", "isis"};
+                         "ih", "is", "isih", "isis"
+                        };
 
 string
 Pitch::to_string () const
 {
   int n = (notename_ + 2) % scale_->step_count ();
   string s = ::to_string (char (n + 'a'));
-  Rational qtones = alteration_ * Rational (4,1);
+  Rational qtones = alteration_ * Rational (4, 1);
   int qt = int (rint (Real (qtones)));
 
   s += string (accname[qt + 4]);
@@ -162,13 +163,13 @@ Pitch::to_string () const
     {
       int o = octave_ + 1;
       while (o--)
-	s += "'";
+        s += "'";
     }
   else if (octave_ < 0)
     {
       int o = (-octave_) - 1;
       while (o--)
-	s += ::to_string (',');
+        s += ::to_string (',');
     }
 
   return s;
@@ -217,21 +218,19 @@ Pitch::down_to (int notename)
   notename_ = notename;
 }
 
-IMPLEMENT_TYPE_P (Pitch, "ly:pitch?");
+const char * const Pitch::type_p_name_ = "ly:pitch?";
+
 SCM
-Pitch::mark_smob (SCM x)
+Pitch::mark_smob () const
 {
-  Pitch *p = (Pitch*) SCM_CELL_WORD_1 (x);
-  return p->scale_->self_scm ();
+  return scale_->self_scm ();
 }
 
-IMPLEMENT_SIMPLE_SMOBS (Pitch);
 int
-Pitch::print_smob (SCM s, SCM port, scm_print_state *)
+Pitch::print_smob (SCM port, scm_print_state *) const
 {
-  Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<Pitch ", port);
-  scm_display (ly_string2scm (r->to_string ()), port);
+  scm_display (ly_string2scm (to_string ()), port);
   scm_puts (" >", port);
   return 1;
 }
@@ -239,12 +238,12 @@ Pitch::print_smob (SCM s, SCM port, scm_print_state *)
 SCM
 Pitch::equal_p (SCM a, SCM b)
 {
-  Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
-  Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
+  Pitch *p = unsmob<Pitch> (a);
+  Pitch *q = unsmob<Pitch> (b);
 
   bool eq = p->notename_ == q->notename_
-    && p->octave_ == q->octave_
-    && p->alteration_ == q->alteration_;
+            && p->octave_ == q->octave_
+            && p->alteration_ == q->alteration_;
 
   return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }
@@ -253,8 +252,8 @@ MAKE_SCHEME_CALLBACK (Pitch, less_p, 2);
 SCM
 Pitch::less_p (SCM p1, SCM p2)
 {
-  Pitch *a = unsmob_pitch (p1);
-  Pitch *b = unsmob_pitch (p2);
+  Pitch *a = unsmob<Pitch> (p1);
+  Pitch *b = unsmob<Pitch> (p2);
 
   if (compare (*a, *b) < 0)
     return SCM_BOOL_T;