Imported Upstream version 16.5~dfsg

1 files changed, 138 insertions, 134 deletions

diff --git a/bird.scm b/bird.scm
index 351a87d..52128f5 100644
--- a/bird.scm
+++ b/bird.scm
@@ -48,7 +48,6 @@
 	    (oridwn '(.00 1.00 1.00 .0))
 	    (oriupdwna '(.00 .00 .60 1.00 1.00 .60 ))
 	    (oriupdwnb '(.00 .50 .30 1.00 1.00 .0))
-	    (oribiga '(.00 .90 .15 1.00 .40 .30 .60 .60 .85 .00 1.00 .0))
 	    (orimid '(.00 1.00 .05 .50 .10 1.00 .25 .00 .85 .50 1.00 .0))
 	    (oridwnup '(.00 .30 .25 .00 1.00 1.0))
 	    (oriamp '(.00 .00 .10 1.00 1.00 .0)))
@@ -57,7 +56,8 @@
 	(bird (+ beg .41) .05 2500 1000 .1 oriup main-amp)
 	(bigbird (+ beg .5) .1 2000 800 .2 oriupdwna main-amp '(1 1 2 .02 3 .05))
 	(bird (+ beg .65) .03 3900 1200 .1 oridwn main-amp)
-	(bigbird (+ beg .7) .21 2000 1200 .15 oribiga main-amp '(1 1 2 .05))
+	(let ((oribiga '(.00 .90 .15 1.00 .40 .30 .60 .60 .85 .00 1.00 .0)))
+	  (bigbird (+ beg .7) .21 2000 1200 .15 oribiga main-amp '(1 1 2 .05)))
 	(bird (+ beg 1.0) .05 4200 1000 .1 oridwn main-amp)
 	(bigbird (+ beg 1.1) .1 2000 1000 .25 orimid main-amp '(1 1 2 .05))
 	(bigbird (+ beg 1.3) .1 2000 1000 .25 orimid main-amp '(1 1 2 .05))
@@ -117,11 +117,11 @@
 (define b-western-meadowlark
   (let ((documentation "(western-meadowlark beg) produces a western meadowlark call at time 'beg'"))
     (lambda (beg)
-      (let ((no-skw '(.00 .00 1.00 .0))
-	    (down-skw '(.00 1.00 .40 .40 1.00 .0))
+      (let ((down-skw '(.00 1.00 .40 .40 1.00 .0))
 	    (fas-down '(.00 1.00 1.00 .0)))
 	(set! beg (- beg .8))
-	(bigbird (+ beg .800) .1 2010.000 0.000 .100 no-skw main-amp '(1 1 2 .04))
+	(let ((no-skw '(.00 .00 1.00 .0)))
+	  (bigbird (+ beg .800) .1 2010.000 0.000 .100 no-skw main-amp '(1 1 2 .04)))
 	(bigbird (+ beg 1.100) .15 3000.000 100.000 .110 down-skw main-amp '(1 1 2 .04))
 	(bigbird (+ beg 1.300) .25 2000.000 150.000 .200 down-skw main-amp '(1 1 2 .04))
 	(bigbird (+ beg 1.650) .15 3010.000 250.000 .110 down-skw main-amp '(1 1 2 .04))
@@ -173,12 +173,12 @@
 (define b-yellow-warbler
   (let ((documentation "(yellow-warbler beg) produces a yellow warbler call at time 'beg'"))
     (lambda (beg)
-      (let ((yellow-up '(.00 .00 .60 1.00 1.00 .50 ))
-	    (yellow-swirl '(.00 1.00 .05 1.00 .60 .00 .80 .30 1.00 .10 ))
+      (let ((yellow-swirl '(.00 1.00 .05 1.00 .60 .00 .80 .30 1.00 .10 ))
 	    (yellow-down '(.00 1.00 1.00 .0))
 	    (yellow-last '(.00 .00 .30 .20 .80 .70 1.00 1.0))
 	    (swirl-amp '(.00 .00 .90 1.00 1.00 .0)))
-	(bird beg .05 5600 400 .05 yellow-up main-amp)
+	(let ((yellow-up '(.00 .00 .60 1.00 1.00 .50 )))
+	  (bird beg .05 5600 400 .05 yellow-up main-amp))
 	(bird (+ beg .23) .12 5000 1500 .15 yellow-swirl swirl-amp)
 	(bird (+ beg .45) .13 5000 1700 .17 yellow-swirl swirl-amp)
 	(bird (+ beg .62) .16 5000 2000 .20 yellow-swirl swirl-amp)
@@ -310,13 +310,13 @@
 	    (buntv '(.00 .00 .50 1.00 1.00 .0))
 	    (bunty '(.00 1.00 .50 .00 1.00 .90 ))
 	    (buntn '(.00 .80 .30 1.00 .70 .20 1.00 .0))
-	    (buntx '(.00 1.00 .10 .50 .25 .90 1.00 .0))
 	    (buntup '(.00 .00 1.00 1.0)))
 	(set! beg (- beg .4))
 	(bird (+ beg .4) .08 3000 700 .25 buntdwn main-amp)
 	(bird (+ beg .52) .02 6200 1000 .05 buntdwn main-amp)
 	(bird (+ beg .55)  .15 3500 2300 .1 buntv main-amp)
-	(bird (+ beg .74) .02 6200 1800 .05 buntx main-amp)
+	(let ((buntx '(.00 1.00 .10 .50 .25 .90 1.00 .0)))
+	  (bird (+ beg .74) .02 6200 1800 .05 buntx main-amp))
 	(bird (+ beg .80) .15 3400 2300 .1 buntv main-amp)
 	(bird (+ beg 1.00) .1 3400 800 .2 buntv main-amp)
 	(bird (+ beg 1.13) .03 4100 2000 .05 buntdwn main-amp)
@@ -382,18 +382,18 @@
 (define b-louisiana-waterthrush
   (let ((documentation "(louisiana-waterthrush beg) produces a louisiana waterthrush call at time 'beg'"))
     (lambda (beg)
-      (let ((water-one '(.00 .80 .35 .40 .45 .90 .50 1.00 .75 1.00 1.00 .10 ))
-	    (water-two '(.00 1.00 .40 .00 .60 .10 1.00 .80 ))
-	    (water-three '(.00 1.00 .95 .00 1.00 .0))
-	    (water-four '(.00 .00 1.00 1.0))
+      (let ((water-four '(.00 .00 1.00 1.0))
 	    (water-five '(.00 1.00 1.00 .0))
-	    (water-amp '(.00 .00 .35 1.00 .50 .20 .90 1.00 1.00 .0))
 	    (water-damp '(.00 .00 .90 1.00 1.00 .0)))
-	(bird beg .17 4100 2000 .2 water-one water-amp)
-	(bird (+ beg .32) .18 4050 2050 .3 water-one water-amp)
-	(bird (+ beg .64) .20 4000 1900 .25 water-one water-amp)
-	(bird (+ beg .9) .2 3900 2000 .3 water-two bird-tap)
-	(bird (+ beg 1.25) .12 3000 3000 .25 water-three water-damp)
+	(let ((water-one '(.00 .80 .35 .40 .45 .90 .50 1.00 .75 1.00 1.00 .10 ))
+	      (water-amp '(.00 .00 .35 1.00 .50 .20 .90 1.00 1.00 .0)))
+	  (bird beg .17 4100 2000 .2 water-one water-amp)
+	  (bird (+ beg .32) .18 4050 2050 .3 water-one water-amp)
+	  (bird (+ beg .64) .20 4000 1900 .25 water-one water-amp))
+	(let ((water-two '(.00 1.00 .40 .00 .60 .10 1.00 .80 )))
+	  (bird (+ beg .9) .2 3900 2000 .3 water-two bird-tap))
+	(let ((water-three '(.00 1.00 .95 .00 1.00 .0)))
+	  (bird (+ beg 1.25) .12 3000 3000 .25 water-three water-damp))
 	(bird (+ beg 1.4) .1 2700 1500 .2 water-four water-damp)
 	(bird (+ beg 1.58) .02 5200 1000 .1 water-five main-amp)
 	(bird (+ beg 1.65) .02 5200 1000 .1 water-five main-amp)
@@ -403,18 +403,18 @@
 (define b-robin
   (let ((documentation "(robin beg) produces a robin call at time 'beg'"))
     (lambda (beg)
-      (let ((r-one '(.00 .10 .08 .70 .30 .00 .35 1.00 .40 .30 1.00 .30 ))
-	    (r-two '(.00 .00 .10 1.00 .20 .70 .35 .70 .65 .30 .70 .50 .80 .00 .90 .20 1.00 .0))
-	    (r-three '(.00 .20 .25 1.00 .60 .70 .90 .00 1.00 .10 ))
-	    (r-four '(.00 1.00 1.00 .0))
-	    (r-five '(.00 .50 .10 .00 .20 1.00 .30 .00 .40 1.00 .50 .00 .60 1.00 .70 .50 1.00 .20 ))
-	    (r-six '(.00 .00 .12 .70 .30 .00 .70 1.00 1.00 .50 )))
-	(set! beg (- beg .45))
-	(bigbird (+ beg .45) .06 2000 800 .15 r-six main-amp '(1 1 2 .1))
-	(bigbird (+ beg .56) .10 2000 900 .15 r-one main-amp '(1 1 2 .1))
-	(bigbird (+ beg 1.04) .24 2000 2000 .25 r-two main-amp '(1 1 2 .1))
-	(bigbird (+ beg 1.63) .13 1900 1600 .20 r-three main-amp '(1 1 2 .1))
-	(bigbird (+ beg 1.80) .11 2200 1200 .25 r-four main-amp '(1 1 2 .1))
+      (set! beg (- beg .45))
+      (let ((r-six '(.00 .00 .12 .70 .30 .00 .70 1.00 1.00 .50 )))
+	(bigbird (+ beg .45) .06 2000 800 .15 r-six main-amp '(1 1 2 .1)))
+      (let ((r-one '(.00 .10 .08 .70 .30 .00 .35 1.00 .40 .30 1.00 .30 )))
+	(bigbird (+ beg .56) .10 2000 900 .15 r-one main-amp '(1 1 2 .1)))
+      (let ((r-two '(.00 .00 .10 1.00 .20 .70 .35 .70 .65 .30 .70 .50 .80 .00 .90 .20 1.00 .0)))
+	(bigbird (+ beg 1.04) .24 2000 2000 .25 r-two main-amp '(1 1 2 .1)))
+      (let ((r-three '(.00 .20 .25 1.00 .60 .70 .90 .00 1.00 .10 )))
+	(bigbird (+ beg 1.63) .13 1900 1600 .20 r-three main-amp '(1 1 2 .1)))
+      (let ((r-four '(.00 1.00 1.00 .0)))
+	(bigbird (+ beg 1.80) .11 2200 1200 .25 r-four main-amp '(1 1 2 .1)))
+      (let ((r-five '(.00 .50 .10 .00 .20 1.00 .30 .00 .40 1.00 .50 .00 .60 1.00 .70 .50 1.00 .20 )))
 	(bigbird (+ beg 2.31) .21 1950 2000 .15 r-five main-amp '(1 1 2 .1))))))
 
 
@@ -463,19 +463,19 @@
 (define b-cerulean-warbler
   (let ((documentation "(cerulean-warbler beg) produces a cerulean warbler call at time 'beg'"))
     (lambda (beg)
-      (let ((w-down '(.00 1.00 1.00 .0))
-	    (trill '(.00 .80 .10 1.00 .25 .50 .40 1.00 .55 .50 .70 1.00 1.00 .0))
-	    (w-up '(.00 .00 1.00 1.0)))
+      (let ((w-up '(.00 .00 1.00 1.0)))
 	(set! beg (- beg .27))
-	(bird (+ beg .27) .05 3000 1000 .05 w-down main-amp)
-	(bird (+ beg .33) .05 3000 800 .075 w-up main-amp)
-	(bird (+ beg .41) .01 3200 700 .07 w-down main-amp)
-	(bird (+ beg .42) .01 3200 700 .08 w-down main-amp)
-	(bird (+ beg .43) .06 3200 700 .09 w-down main-amp)
+	(let ((w-down '(.00 1.00 1.00 .0)))
+	  (bird (+ beg .27) .05 3000 1000 .05 w-down main-amp)
+	  (bird (+ beg .33) .05 3000 800 .075 w-up main-amp)
+	  (bird (+ beg .41) .01 3200 700 .07 w-down main-amp)
+	  (bird (+ beg .42) .01 3200 700 .08 w-down main-amp)
+	  (bird (+ beg .43) .06 3200 700 .09 w-down main-amp))
 	(bird (+ beg .51) .06 3200 500 .1 w-up main-amp)
-	(bird (+ beg .6) .10 3000 1200 .2 trill main-amp)
-	(bird (+ beg .72) .05 3000 800 .2 w-up main-amp)
-	(bird (+ beg .8) .10 3000 1200 .2 trill main-amp)
+	(let ((trill '(.00 .80 .10 1.00 .25 .50 .40 1.00 .55 .50 .70 1.00 1.00 .0)))
+	  (bird (+ beg .6) .10 3000 1200 .2 trill main-amp)
+	  (bird (+ beg .72) .05 3000 800 .2 w-up main-amp)
+	  (bird (+ beg .8) .10 3000 1200 .2 trill main-amp))
 	(bird (+ beg .92) .05 3000 800 .2 w-up main-amp)
 	(bird (+ beg 1.00) .01 3900 600 .1 w-up main-amp)
 	(bird (+ beg 1.01) .01 3910 800 .1 w-up main-amp)
@@ -536,49 +536,49 @@
 (define b-eastern-phoebe
   (let ((documentation "(eastern-phoebe beg) produces an eastern-phoebe call at time 'beg'"))
     (lambda (beg)
-      (let ((phoebe-one '(.00 .00 .30 .30 .35 .50 .55 .40 .70 .80 .75 .70 .80 1.00 .95 .90 1.00 .0))
-	    (phoebe-two '(.00 .00 .50 1.00 1.00 .0))
-	    (phoebe-three '(.00 .00 .10 .40 .80 1.00 1.00 .10 ))
-	    (phoebe-four '(.00 1.00 .50 .70 1.00 .0))
-	    (phoebe-amp '(.00 .00 .10 1.00 1.00 .0)))
-	(bird beg .225 3000 1300 .3 phoebe-one main-amp)
-	(bird (+ beg .35) .12 3000 500 .1 phoebe-two phoebe-amp)
-	(bird (+ beg .4) .10 3000 1500 .2 phoebe-three phoebe-amp)
-	(bird (+ beg .55) .05 3000 1400 .2 phoebe-four phoebe-amp)))))
+      (let ((phoebe-amp '(.00 .00 .10 1.00 1.00 .0)))
+	(let ((phoebe-one '(.00 .00 .30 .30 .35 .50 .55 .40 .70 .80 .75 .70 .80 1.00 .95 .90 1.00 .0)))
+	  (bird beg .225 3000 1300 .3 phoebe-one main-amp))
+	(let ((phoebe-two '(.00 .00 .50 1.00 1.00 .0)))
+	  (bird (+ beg .35) .12 3000 500 .1 phoebe-two phoebe-amp))
+	(let ((phoebe-three '(.00 .00 .10 .40 .80 1.00 1.00 .10 )))
+	  (bird (+ beg .4) .10 3000 1500 .2 phoebe-three phoebe-amp))
+	(let ((phoebe-four '(.00 1.00 .50 .70 1.00 .0)))
+	  (bird (+ beg .55) .05 3000 1400 .2 phoebe-four phoebe-amp))))))
 
 
 (define b-painted-bunting
   (let ((documentation "(painted-bunting beg) produces a painted bunting call at time 'beg'"))
     (lambda (beg)
-      (let ((b-one '(.00 .00 1.00 1.0))
-	    (b-two '(.00 .00 .90 1.00 1.00 .0))
-	    (b-three '(.00 1.00 1.00 .0))
-	    (b-four '(.00 .00 .50 1.00 1.00 .0))
-	    (b-five '(.00 .70 .15 .00 .40 1.00 .80 1.00 1.00 .50 ))
-	    (b-six '(.00 .00 .10 .50 .15 .00 .40 1.00 .90 1.00 1.00 .0))
-	    (b-seven '(.00 1.00 .25 .40 .75 .50 1.00 .0))
-	    (b-eight '(.00 .30 .40 .40 .50 1.00 .60 .20 1.00 .0))
-	    (b-nine '(.00 .00 .05 1.00 .30 1.00 .50 .30 .90 1.00 1.00 .0))
-	    (b-ten '(.00 .40 .25 .00 .35 1.00 .50 .00 .65 1.00 .75 .00 .85 1.00 1.00 .0))
-	    (b-eleven '(.00 1.00 1.00 .0))
-	    (b-twelve '(.00 .00 .50 1.00 1.00 .50 ))
-	    (b-thirteen '(.00 .00 .05 1.00 .30 .20 .60 .20 .90 1.00 1.00 .0))
-	    (b-fourteen '(.00 .30 .30 1.00 .60 .30 1.00 .0))
-	    (b-fifteen '(.00 .00 .10 .50 .50 .50 .90 1.00 1.00 .0)))
+      (let ((b-one '(.00 .00 1.00 1.0)))
 	(set! beg (- beg .05))
-	(bird (+ beg .05) .10 3100 900 .05 b-one b-two)
-	(bird (+ beg .21) .07 4100 700 .15 b-three main-amp)
-	(bird (+ beg .36) .12 3700 1000 .20 b-four main-amp)
-	(bird (+ beg .52) .08 2300 1600 .15 b-five b-six)
+	(let ((b-two '(.00 .00 .90 1.00 1.00 .0)))
+	  (bird (+ beg .05) .10 3100 900 .05 b-one b-two))
+	(let ((b-three '(.00 1.00 1.00 .0)))
+	  (bird (+ beg .21) .07 4100 700 .15 b-three main-amp))
+	(let ((b-four '(.00 .00 .50 1.00 1.00 .0)))
+	  (bird (+ beg .36) .12 3700 1000 .20 b-four main-amp))
+	(let ((b-five '(.00 .70 .15 .00 .40 1.00 .80 1.00 1.00 .50 ))
+	      (b-six '(.00 .00 .10 .50 .15 .00 .40 1.00 .90 1.00 1.00 .0)))
+	  (bird (+ beg .52) .08 2300 1600 .15 b-five b-six))
 	(bird (+ beg .68) .1 4000 1000 .25 b-one bird-tap)
-	(bird (+ beg .8) .12 2300 1700 .2 b-seven main-amp)
-	(bird (+ beg .96) .15 3800 2200 .3 b-eight b-nine)
-	(bird (+ beg 1.18) .1 2300 1600 .15 b-ten main-amp)
-	(bird (+ beg 1.3) .02 3200 1000 .1 b-eleven main-amp)
-	(bird (+ beg 1.33) .02 3200 1000 .1 b-eleven main-amp)
-	(bird (+ beg 1.36) .02 3200 1000 .1 b-eleven main-amp)
-	(bird (+ beg 1.40) .03 4000 2000 .12 b-twelve b-thirteen)
-	(bird (+ beg 1.47) .1 2300 1700 .2 b-fourteen b-fifteen)))))
+	(let ((b-seven '(.00 1.00 .25 .40 .75 .50 1.00 .0)))
+	  (bird (+ beg .8) .12 2300 1700 .2 b-seven main-amp))
+	(let ((b-eight '(.00 .30 .40 .40 .50 1.00 .60 .20 1.00 .0))
+	      (b-nine '(.00 .00 .05 1.00 .30 1.00 .50 .30 .90 1.00 1.00 .0)))
+	  (bird (+ beg .96) .15 3800 2200 .3 b-eight b-nine))
+	(let ((b-ten '(.00 .40 .25 .00 .35 1.00 .50 .00 .65 1.00 .75 .00 .85 1.00 1.00 .0)))
+	  (bird (+ beg 1.18) .1 2300 1600 .15 b-ten main-amp))
+	(let ((b-eleven '(.00 1.00 1.00 .0)))
+	  (bird (+ beg 1.3) .02 3200 1000 .1 b-eleven main-amp)
+	  (bird (+ beg 1.33) .02 3200 1000 .1 b-eleven main-amp)
+	  (bird (+ beg 1.36) .02 3200 1000 .1 b-eleven main-amp))
+	(let ((b-twelve '(.00 .00 .50 1.00 1.00 .50 ))
+	      (b-thirteen '(.00 .00 .05 1.00 .30 .20 .60 .20 .90 1.00 1.00 .0)))
+	  (bird (+ beg 1.40) .03 4000 2000 .12 b-twelve b-thirteen))
+	(let ((b-fourteen '(.00 .30 .30 1.00 .60 .30 1.00 .0))
+	      (b-fifteen '(.00 .00 .10 .50 .50 .50 .90 1.00 1.00 .0)))
+	  (bird (+ beg 1.47) .1 2300 1700 .2 b-fourteen b-fifteen))))))
 
 
 (define b-western-flycatcher
@@ -595,12 +595,10 @@
 (define b-bachmans-sparrow
   (let ((documentation "(bachmans-sparrow beg) produces a bachmans sparrow call at time 'beg'"))
     (lambda (beg)
-      (let ((sopening '(.00 1.00 .10 .50 .90 .50 1.00 .0))
-	    (sup '(.00 .10 .35 .00 1.00 1.0))
-	    (sdwn '(.00 1.00 .40 .50 1.00 .0))
-	    (supn '(.00 .00 1.00 1.0))
-	    (slast '(.00 1.00 .25 .00 .75 .40 1.00 .50 )))
-	(bird beg .51 4900 200 .3 sopening main-amp)
+      (let ((sup '(.00 .10 .35 .00 1.00 1.0))
+	    (sdwn '(.00 1.00 .40 .50 1.00 .0)))
+	(let ((sopening '(.00 1.00 .10 .50 .90 .50 1.00 .0)))
+	  (bird beg .51 4900 200 .3 sopening main-amp))
 	(bird (+ beg .52) .015 3800 200 .1 sup main-amp)
 	(bird (+ beg .52) .015 3750 250 .1 sup main-amp)
 	(bird (+ beg .54) .015 3600 300 .1 sup main-amp)
@@ -624,23 +622,25 @@
 	(bird (+ beg 1.55) .07 3000 750 .2 sup main-amp)
 	(bird (+ beg 1.63) .03 5000 1000 .1 sdwn main-amp)
 	
-	(bird (+ beg 2.8) .06 4000 1700 .1 supn main-amp)
-	(bird (+ beg 2.87) .01 5200 0 .2 supn main-amp)
-	(bird (+ beg 2.9) .06 4000 1700 .1 supn main-amp)
-	(bird (+ beg 2.97) .01 5200 0 .2 supn main-amp)
-	(bird (+ beg 3.0) .06 4000 1700 .1 supn main-amp)
-	(bird (+ beg 3.07) .01 5200 0 .2 supn main-amp)
-	(bird (+ beg 3.1) .06 4000 1700 .1 supn main-amp)
-	(bird (+ beg 3.17) .01 5200 0 .2 supn main-amp)
-	(bird (+ beg 3.2) .06 4000 1700 .1 supn main-amp)
-	(bird (+ beg 3.27) .01 5200 0 .2 supn main-amp)
+	(let ((supn '(.00 .00 1.00 1.0)))
+	  (bird (+ beg 2.8) .06 4000 1700 .1 supn main-amp)
+	  (bird (+ beg 2.87) .01 5200 0 .2 supn main-amp)
+	  (bird (+ beg 2.9) .06 4000 1700 .1 supn main-amp)
+	  (bird (+ beg 2.97) .01 5200 0 .2 supn main-amp)
+	  (bird (+ beg 3.0) .06 4000 1700 .1 supn main-amp)
+	  (bird (+ beg 3.07) .01 5200 0 .2 supn main-amp)
+	  (bird (+ beg 3.1) .06 4000 1700 .1 supn main-amp)
+	  (bird (+ beg 3.17) .01 5200 0 .2 supn main-amp)
+	  (bird (+ beg 3.2) .06 4000 1700 .1 supn main-amp)
+	  (bird (+ beg 3.27) .01 5200 0 .2 supn main-amp))
 	
-	(bird (+ beg 3.4) .15 3000 1000 .2 slast main-amp)
-	(bird (+ beg 3.6) .15 3000 1000 .2 slast main-amp)
-	(bird (+ beg 3.8) .15 3000 1000 .2 slast main-amp)
-	(bird (+ beg 4.0) .15 3000 1000 .2 slast main-amp)
-	(bird (+ beg 4.2) .15 3000 1000 .2 slast main-amp)
-	(bird (+ beg 4.4) .15 3000 1000 .2 slast main-amp)))))
+	(let ((slast '(.00 1.00 .25 .00 .75 .40 1.00 .50 )))
+	  (bird (+ beg 3.4) .15 3000 1000 .2 slast main-amp)
+	  (bird (+ beg 3.6) .15 3000 1000 .2 slast main-amp)
+	  (bird (+ beg 3.8) .15 3000 1000 .2 slast main-amp)
+	  (bird (+ beg 4.0) .15 3000 1000 .2 slast main-amp)
+	  (bird (+ beg 4.2) .15 3000 1000 .2 slast main-amp)
+	  (bird (+ beg 4.4) .15 3000 1000 .2 slast main-amp))))))
 
 
 (define b-cedar-waxwing
@@ -654,16 +654,17 @@
 (define b-bairds-sparrow
   (let ((documentation "(bairds-sparrow beg) produces a bairds sparrow call at time 'beg'"))
     (lambda (beg)
-      (let ((bairdend '(.00 .00 .25 1.00 .50 .00 .75 1.00 1.00 .0))
-	    (bairdstart '(.00 .50 .05 1.00 .10 .00 .15 1.00 .20 .00 .25 1.00 .30 .00 .35 1.00 .40 .00 .45 1.00 .50 .00 .55 1.00 .60 .00 .65 1.00 .70 .00 .75 1.00 .80 .00 .85 1.00 .90 .00 .95 1.00 1.00 .0)))
-	(bird beg .09 6500 1500 .2 bairdstart main-amp)
-	(bird (+ beg .22) .01 5900 100 .2 bairdend main-amp)
-	(bird (+ beg .25) .09 6000 1000 .2 bairdstart main-amp)
-	(bird (+ beg .45) .01 4200 100 .2 bairdend main-amp)
-	(bird (+ beg .50) .08 4200 600 .2 bairdstart main-amp)
-	(bird (+ beg .59) .01 4400 100 .2 bairdend main-amp)
-	(bird (+ beg .60) .01 4400 100 .2 bairdend main-amp)
-	(bird (+ beg .68) .07 5400 700 .2 bairdstart main-amp)
+      (let ((bairdend '(.00 .00 .25 1.00 .50 .00 .75 1.00 1.00 .0)))
+	(let ((bairdstart '(.00 .50 .05 1.00 .10 .00 .15 1.00 .20 .00 .25 1.00 .30 .00 .35 1.00 .40 .00 .45 1.00 
+			    .50 .00 .55 1.00 .60 .00 .65 1.00 .70 .00 .75 1.00 .80 .00 .85 1.00 .90 .00 .95 1.00 1.00 .0)))
+	  (bird beg .09 6500 1500 .2 bairdstart main-amp)
+	  (bird (+ beg .22) .01 5900 100 .2 bairdend main-amp)
+	  (bird (+ beg .25) .09 6000 1000 .2 bairdstart main-amp)
+	  (bird (+ beg .45) .01 4200 100 .2 bairdend main-amp)
+	  (bird (+ beg .50) .08 4200 600 .2 bairdstart main-amp)
+	  (bird (+ beg .59) .01 4400 100 .2 bairdend main-amp)
+	  (bird (+ beg .60) .01 4400 100 .2 bairdend main-amp)
+	  (bird (+ beg .68) .07 5400 700 .2 bairdstart main-amp))
 	(bird (+ beg .75) .01 4200 100 .2 bairdend main-amp)
 	(bird (+ beg .79) .01 4400 100 .2 bairdend main-amp)
 	(bird (+ beg .83) .01 4200 100 .19 bairdend main-amp)
@@ -702,11 +703,11 @@
     (lambda (beg)
       (let ((kenstart '(.00 .30 .50 1.00 1.00 .0))
 	    (kendwn '(.00 .90 .10 1.00 1.00 .0))
-	    (kenup '(.00 .00 1.00 1.0))
 	    (kentrill '(.00 1.00 .25 .00 .50 .00 .75 1.00 1.00 .0)))
 	(set! beg (- beg .6))
 	(bigbird (+ beg .6) .02 3800 200 .05 kenstart main-amp '(1 1 2 .03))
-	(bigbird (+ beg .65) .03 4300 200 .15 kenup main-amp '(1 1 2 .1))
+	(let ((kenup '(.00 .00 1.00 1.0)))
+	  (bigbird (+ beg .65) .03 4300 200 .15 kenup main-amp '(1 1 2 .1)))
 	(bigbird (+ beg .73) .02 3200 100 .1 kendwn main-amp '(1 1 2 .1))
 	
 	(bigbird (+ beg .75) .05 3000 800 .15 kenstart main-amp '(1 1 2 .01))
@@ -741,14 +742,15 @@
 (define b-rufous-sided-towhee
   (let ((documentation "(rufous-sided-towhee beg) produces a rufous sided towhee call at time 'beg'"))
     (lambda (beg)
-      (let ((towhee-one '(.00 .10 .02 .05 .04 .15 .06 .05 .08 .20 .10 .04 .12 .25 .14 .03 .16 .30 .18 .02 .20 .35 .22 .01 .24 .40 .26 .00 .28 .45 .30 .00 .32 .50 .34 .00 .36 .50 .80 1.00 1.00 .0))
-	    (towhee-two '(.00 .00 1.00 1.0))
+      (let ((towhee-two '(.00 .00 1.00 1.0))
 	    (towhee-three '(.00 1.00 1.00 .0)))
 	(set! beg (- beg .25))
-	(bigbird (+ beg .25) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
-	(bigbird (+ beg .45) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
-	(bigbird (+ beg .60) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
-	(bigbird (+ beg .75) .10 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
+	(let ((towhee-one '(.00 .10 .02 .05 .04 .15 .06 .05 .08 .20 .10 .04 .12 .25 .14 .03 .16 .30 .18 .02 .20 .35 .22 .01 .24 
+			    .40 .26 .00 .28 .45 .30 .00 .32 .50 .34 .00 .36 .50 .80 1.00 1.00 .0)))
+	  (bigbird (+ beg .25) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
+	  (bigbird (+ beg .45) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
+	  (bigbird (+ beg .60) .13 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03))
+	  (bigbird (+ beg .75) .10 1400 1100 .2 towhee-one main-amp '(1 .03 2 1 3 .03)))
 	
 	(bird (+ beg .88) .01 5100 2000 .1 towhee-two main-amp)
 	(bird (+ beg .895) .01 5100 1600 .1 towhee-two main-amp)
@@ -955,20 +957,22 @@
   (let ((documentation "(black-throated-sparrow beg) produces a black throated sparrow call at time 'beg'"))
     (lambda (beg)
       (let ((black-up '(.00 .00 1.00 1.0))
-	    (black-down '(.00 1.00 1.00 .0))
-	    (black-down-amp '(.00 .00 .75 1.00 1.00 .0))
-	    (black-trill '(.00 .00 .03 .70 .06 .00 .09 .75 .12 .00 .15 .80 .18 .05 .21 .85 .24 .10 .27 .90 .30 .10 .33 1.00 .36 .10 .39 1.00 .42 .10 .45 1.00 .48 .10 .51 1.00 .54 .10 .57 1.00 .60 .10 .63 1.00 .66 .10 .69 1.00 .72 .10 .75 1.00 .78 .10 .81 1.00 .84 .10 .87 1.00 .90 .00 .93 .95 .96 .00 1.00 .90 ))
-	    (black-up-down '(.00 .00 .50 1.00 1.00 .20 ))
 	    (black-amp '(.00 .00 .50 1.00 1.00 .0)))
 	(set! beg (- beg .8))
-	(bird (+ beg .8) .02 2200 1000 .1 black-down bird-amp)
-	(bird (+ beg .83) .01 3000 200 .05 black-up bird-amp)
-	(bird (+ beg .96) .02 5800 500 .05 black-up bird-amp)
-	(bird (+ beg 1.00) .02 4000 200 .05 black-up bird-amp)
-	(bird (+ beg 1.04) .10 2100 1700 .15 black-down black-down-amp)
+	(let ((black-down '(.00 1.00 1.00 .0))
+	      (black-down-amp '(.00 .00 .75 1.00 1.00 .0)))
+	  (bird (+ beg .8) .02 2200 1000 .1 black-down bird-amp)
+	  (bird (+ beg .83) .01 3000 200 .05 black-up bird-amp)
+	  (bird (+ beg .96) .02 5800 500 .05 black-up bird-amp)
+	  (bird (+ beg 1.00) .02 4000 200 .05 black-up bird-amp)
+	  (bird (+ beg 1.04) .10 2100 1700 .15 black-down black-down-amp))
 	(bird (+ beg 1.15) .05 5700 400 .25 black-up bird-amp)
-	(bird (+ beg 1.25) .25 2000 900 .2 black-trill bird-amp)
-	(bird (+ beg 1.52) .05 5600 400 .15 black-up-down bird-amp)
+	(let ((black-trill '(.00 .00 .03 .70 .06 .00 .09 .75 .12 .00 .15 .80 .18 .05 .21 .85 .24 .10 .27 .90 
+			     .30 .10 .33 1.00 .36 .10 .39 1.00 .42 .10 .45 1.00 .48 .10 .51 1.00 .54 .10 .57 1.00 
+			     .60 .10 .63 1.00 .66 .10 .69 1.00 .72 .10 .75 1.00 .78 .10 .81 1.00 .84 .10 .87 1.00 .90 .00 .93 .95 .96 .00 1.00 .90 )))
+	  (bird (+ beg 1.25) .25 2000 900 .2 black-trill bird-amp))
+	(let ((black-up-down '(.00 .00 .50 1.00 1.00 .20 )))
+	  (bird (+ beg 1.52) .05 5600 400 .15 black-up-down bird-amp))
 	
 	(bird (+ beg 1.6) .04 3900 1100 .15 black-up bird-amp)
 	(bird (+ beg 1.66) .01 1900 100 .10 black-up black-amp)
@@ -1004,12 +1008,12 @@
 (define b-black-chinned-sparrow
   (let ((documentation "(black-chinned-sparrow beg) produces a black chinned sparrow call at time 'beg'"))
     (lambda (beg)
-      (let ((chin-up '(.00 .00 1.00 1.0))
-	    (chin-up2 '(.00 .00 .30 .20 1.00 1.0)))
+      (let ((chin-up '(.00 .00 1.00 1.0)))
 	(set! beg (- beg .6))
 	(bird (+ beg .6) .2 4200 100 .1 chin-up bird-amp)
-	(bird (+ beg 1.0) .09 3800 2000 .1 chin-up2 bird-amp)
-	(bird (+ beg 1.25) .08 3900 1700 .12 chin-up2 bird-amp)
+	(let ((chin-up2 '(.00 .00 .30 .20 1.00 1.0)))
+	  (bird (+ beg 1.0) .09 3800 2000 .1 chin-up2 bird-amp)
+	  (bird (+ beg 1.25) .08 3900 1700 .12 chin-up2 bird-amp))
 	(bird (+ beg 1.40) .08 3600 2300 .13 chin-up bird-amp)
 	(bird (+ beg 1.50) .11 3100 2800 .14 chin-up bird-amp)
 	(bird (+ beg 1.65) .07 2900 2700 .15 chin-up bird-amp)