Merge remote branch 'origin/master' into samth/new-logic2

Conflicts:
	collects/drscheme/private/insert-large-letters.ss
	collects/tests/typed-scheme/unit-tests/typecheck-tests.ss

.gitignore

@@ -10,7 +10,8 @@
 # a common convenient place to set the PLTADDON directory to
 /add-on/
 
-# common backups, autosaves, and lock files
+# common backups, autosaves, lock files, OS meta-files
 *~
 \#*
 .#*
+.DS_Store

collects/2htdp/image.rkt

@@ -115,6 +115,8 @@ and they all have good sample contracts. (It is amazing what we can do with kids
          
          make-color
          make-pen
+         
+         save-image
          )
 
 (provide bitmap)

collects/2htdp/tests/batch-io.rkt

@@ -1,6 +1,6 @@
 #lang scheme/load 
 
-(require schemeunit)
+(require rktunit)
 (require 2htdp/batch-io)
 
 (define file "batch-io.txt")
@@ -25,14 +25,14 @@ eos
 (check-true (string=? (read-file file) test2) "read-file 2")
 
 (write-file file test1)
-(check-equal? (read-as-lines file) (list test1) "as-lines 1")
+(check-equal? (read-lines file) (list test1) "as-lines 1")
 
 (write-file file test2)
-(check-equal? (read-as-lines file) test2-as-list "as-lines 2")
+(check-equal? (read-lines file) test2-as-list "as-lines 2")
 
 (define as-1strings1 (map string (string->list test1)))
 (write-file file test1)
-(check-equal? (read-as-1strings file) as-1strings1 "as-1strings 1")
+(check-equal? (read-1strings file) as-1strings1 "as-1strings 1")
 
 (define as-1strings2 
   (map string
@@ -43,7 +43,7 @@ eos
                            test2-as-list))))))
 
 (write-file file test2)
-(check-equal? (read-as-1strings file) as-1strings2 "as-lines 2")
+(check-equal? (read-1strings file) as-1strings2 "as-lines 2")
 
 (define test2-a-as-list '("test1" "" "test2"))
 
@@ -55,8 +55,8 @@ eos
                (second test2-as-list))))
 
 (write-file file test2-a)
-(check-equal? (read-as-lines file) test2-a-as-list "as-lines 2-a")
-(check-equal? (read-as-words file) '("test1" "test2") "as-words 2-a")
+(check-equal? (read-lines file) test2-a-as-list "as-lines 2-a")
+(check-equal? (read-words file) '("test1" "test2") "as-words 2-a")
 
 (define test3 #<< eos
  word1, word2 
@@ -65,13 +65,13 @@ eos
   )
 
 (write-file file test3)
-(check-equal? (read-as-words file) '("word1," "word2" "word3," "word4")
+(check-equal? (read-words file) '("word1," "word2" "word3," "word4")
               "as-words")
-(check-equal? (read-as-words/line file) '(("word1," "word2") ("word3," "word4"))
+(check-equal? (read-words/line file) '(("word1," "word2") ("word3," "word4"))
               "as-words")
-(check-equal? (read-as-csv file) '(("word1" "word2") ("word3" "word4"))
+(check-equal? (read-csv-file file) '(("word1" "word2") ("word3" "word4"))
               "as-cvs 1")
-(check-equal? (read-as-csv/rows file length) '(2 2) 
+(check-equal? (read-csv-file/rows file length) '(2 2) 
               "as-csv/rows")
 
 
@@ -82,8 +82,8 @@ eos
 (check-exn exn:fail:contract? (lambda () (read-file 0)))
 (check-exn exn:fail:contract? (lambda () (read-file '("test"))))
 
-(check-exn exn:fail:contract? (lambda () (read-as-lines 0)))
-(check-exn exn:fail:contract? (lambda () (read-as-lines '("test"))))
+(check-exn exn:fail:contract? (lambda () (read-lines 0)))
+(check-exn exn:fail:contract? (lambda () (read-lines '("test"))))
 
-(check-exn exn:fail:contract? (lambda () (read-as-1strings 0)))
-(check-exn exn:fail:contract? (lambda () (read-as-1strings '("test"))))
+(check-exn exn:fail:contract? (lambda () (read-1strings 0)))
+(check-exn exn:fail:contract? (lambda () (read-1strings '("test"))))

collects/2htdp/tests/test-image.rkt

@@ -45,7 +45,7 @@
          scheme/math
          scheme/class
          scheme/gui/base
-         schemeunit
+         rktunit
          (prefix-in 1: htdp/image)
          (only-in lang/htdp-advanced equal~?))