# HG changeset patch
# User David Lewis <d.lewis@gold.ac.uk>
# Date 1188296247 -3600
# Node ID 188fe5ea837f7694bf9e0e4f6b270fc8ad402e40
# Parent  5e362d998f294f1ea8c67a1e65806f9dddbf3826
Miscellaneous patching. Fixing exports, etc.

darcs-hash:20070828101727-f76cc-9e3b1f75cff6f43212f8862153db9ca806f606b8.gz

diff -r 5e362d998f29 -r 188fe5ea837f implementations/geerdes/methods.lisp
--- a/implementations/geerdes/methods.lisp	Tue Aug 28 11:15:24 2007 +0100
+++ b/implementations/geerdes/methods.lisp	Tue Aug 28 11:17:27 2007 +0100
@@ -157,11 +157,13 @@
 (defmethod get-applicable-key-signatures ((anchored-period anchored-period) (composition midi-composition))
   (%find-overlapping anchored-period (key-signatures composition)))
 
+(defparameter *stuff* nil)
 (defun %find-overlapping (period1 period-list)
   (let ((result-list))
+    (setf *stuff* (cons period1 period-list))
     (dolist (period2 period-list result-list)
       (cond
-	((before period1 period2)
+	((time>= period2 (cut-off period1))
 	 (return-from %find-overlapping (reverse result-list)))
-	((not (before period2 period1))
+	((time> (cut-off period2) period1)
 	 (push period2 result-list))))))
\ No newline at end of file
diff -r 5e362d998f29 -r 188fe5ea837f implementations/geerdes/package.lisp
--- a/implementations/geerdes/package.lisp	Tue Aug 28 11:15:24 2007 +0100
+++ b/implementations/geerdes/package.lisp	Tue Aug 28 11:17:27 2007 +0100
@@ -4,6 +4,8 @@
    ;; classes
    #:geerdes-composition
    #:geerdes-monody
+   #:geerdes-pitched-event
+   #:geerdes-percussive-event
    ;; identifier constructors
    #:g-id
    #:g-id-file-id
diff -r 5e362d998f29 -r 188fe5ea837f tools/package.lisp
--- a/tools/package.lisp	Tue Aug 28 11:15:24 2007 +0100
+++ b/tools/package.lisp	Tue Aug 28 11:17:27 2007 +0100
@@ -1,6 +1,7 @@
 (cl:defpackage #:amuse-tools
   (:use #:common-lisp #:amuse #:amuse-utils #:midi)
   (:export #:play
+	   #:write-midi
 	   #:make-midi
 	   #:global-messages
 	   #:tempo-message