# HG changeset patch
# User c.rhodes <c.rhodes@gold.ac.uk>
# Date 1185442192 -3600
# Node ID 7f139c81752e18312e186878668b0f5294a5436b
# Parent  67f96832cfb016ab25ab54c44698b4bd67db498b
rename make-pitch-interval to make-chromatic-pitch-interval

darcs-hash:20070726092952-dc3a5-5a59469fbb77e74dca807e5fb277c6342bb0891b.gz

diff -r 67f96832cfb0 -r 7f139c81752e base/constructors.lisp
--- a/base/constructors.lisp	Wed Jul 25 09:43:50 2007 +0100
+++ b/base/constructors.lisp	Thu Jul 26 10:29:52 2007 +0100
@@ -32,7 +32,7 @@
 (defun make-mips-pitch (cp mp)
   (make-instance 'mips-pitch :cp cp :mp mp))
 
-(defun make-pitch-interval (span)
+(defun make-chromatic-pitch-interval (span)
   (make-instance 'pitch-interval :span span))
 
 ;; Events
diff -r 67f96832cfb0 -r 7f139c81752e base/methods.lisp
--- a/base/methods.lisp	Wed Jul 25 09:43:50 2007 +0100
+++ b/base/methods.lisp	Thu Jul 26 10:29:52 2007 +0100
@@ -294,23 +294,20 @@
 
 (defmethod pitch+ ((object1 pitch-interval)
 		   (object2 pitch-interval))
-  (make-pitch-interval (+ (span object1)
-			  (span object2))))
+  (make-chromatic-pitch-interval (+ (span object1) (span object2))))
 
 (defmethod pitch- ((object1 pitch-designator)
 		   (object2 pitch-designator))
-  (make-pitch-interval (- (midi-pitch-number object1)
-			  (midi-pitch-number object2))))
+  (make-chromatic-pitch-interval 
+   (- (midi-pitch-number object1) (midi-pitch-number object2))))
 
 (defmethod pitch- ((object1 pitch-designator)
 		   (object2 pitch-interval))
-  (make-chromatic-pitch (- (midi-pitch-number object1)
-			   (span object2))))
+  (make-chromatic-pitch (- (midi-pitch-number object1) (span object2))))
 
 (defmethod pitch- ((object1 pitch-interval)
 		   (object2 pitch-interval))
-  (make-pitch-interval (- (span object1)
-			  (span object2))))
+  (make-chromatic-pitch-interval (- (span object1) (span object2))))
 
 (defmethod pitch- ((object1 pitch-interval)
 		   (object2 pitch-designator))
@@ -376,7 +373,7 @@
 ;; ...and
 
 (defmethod period= ((object1 anchored-period)
-		     (object2 anchored-period))
+                    (object2 anchored-period))
   (and (time= object1 object2)
        (duration= object1 object2)))
 (defmethod period= ((object1 floating-period)
diff -r 67f96832cfb0 -r 7f139c81752e base/package.lisp
--- a/base/package.lisp	Wed Jul 25 09:43:50 2007 +0100
+++ b/base/package.lisp	Thu Jul 26 10:29:52 2007 +0100
@@ -101,7 +101,7 @@
 	   #:make-anchored-period
 	   #:make-chromatic-pitch
 	   #:make-diatonic-pitch
-	   #:make-pitch-interval
+	   #:make-chromatic-pitch-interval
 	   #:make-chromatic-pitched-event
 	   #:make-basic-time-signature
 	   #:make-basic-key-signature