games collection fixes

svn: r8770

collects/games/aces/aces.scm

@@ -7,12 +7,7 @@ possible to remap single click (instead of double click)?
 
 #lang mzscheme
 
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/list mzlib/unit string-constants
-         (lib "class.ss")
-         (lib "mred.ss" "mred")
-         (lib "list.ss")
-         (lib "unit.ss")
-         (lib "string-constant.ss" "string-constants")
          "../show-help.ss")
 
 (provide game@)

collects/games/blackjack/blackjack.ss

@@ -31,11 +31,7 @@
 
 #lang mzscheme
 
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib class mzlib/list mzlib/unit)
-         (lib "mred.ss" "mred")
-         (lib "class.ss")
-         (lib "list.ss")
-         (lib "unit.ss"))
 
 (provide game@)
 (define game@ (unit (import) (export)

collects/games/cards.ss

@@ -0,0 +1,4 @@
+#lang mzscheme
+
+(require "cards/cards.ss")
+(provide (all-from "cards/cards.ss"))

collects/games/cards/base.ss

@@ -1,17 +1,13 @@
 
 (module base mzscheme
-  (require (lib "class.ss")
+  (require mzlib/class mzlib/etc "make-cards.ss" "classes.ss" "card-class.ss")
-	   (lib "etc.ss")
-	   "make-cards.ss"
-	   "classes.ss"
-           "card-class.ss")
 
   (provide make-table make-deck make-card
            table<%> card<%>)
 
   (define table<%> (class->interface table%))
   (define card<%> (class->interface card%))
-  
+
   (define make-table
     (opt-lambda ([title "Cards"][w 7][h 3])
       (make-object table% title w h)))

collects/games/cards/doc.txt

@@ -3,9 +3,9 @@ The _Virtual Playing Cards Library_
 -----------------------------------
 
 Load the virtual card library with
-   (require (lib "cards.ss" "games" "cards"))
+   (require games/cards)
 
-The _cards.ss_ module defines the following procedures:
+The _cards_ module defines the following procedures:
 
 > (make-table [title-string] [w] [h]) returns a table named by
       `title-string' that is `w' cards wide and `h' cards high. A

collects/games/cards/main.ss

@@ -1,4 +1,4 @@
+#lang mzscheme
 
-(module main mzscheme
+(require "cards.ss")
-  (require "cards.ss")
+(provide (all-from "cards.ss"))
-  (provide (all-from "cards.ss")))

collects/games/crazy8s/crazy8s.ss

@@ -1,14 +1,8 @@
 
 #lang mzscheme
 
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/unit mzlib/etc mzlib/list mzlib/file
-         (lib "mred.ss" "mred")
+         mzlib/async-channel)
-         (lib "class.ss")
-         (lib "unit.ss")
-         (lib "etc.ss")
-         (lib "list.ss")
-         (lib "async-channel.ss")
-         (lib "file.ss"))
 
 ;; Player record
 (define-struct player (r hand-r  ; region

collects/games/ginrummy/ginrummy.ss

@@ -1,9 +1,5 @@
 #lang mzscheme
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/unit mzlib/list)
-         (lib "mred.ss" "mred")
-         (lib "class.ss")
-         (lib "unit.ss")
-         (lib "list.ss"))
 
 (provide game@)
 (define game@ (unit (import) (export)

collects/games/gofish/gofish.ss

@@ -1,9 +1,5 @@
 #lang mzscheme
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/unit mzlib/list)
-         (lib "mred.ss" "mred")
-         (lib "class.ss")
-         (lib "unit.ss")
-         (lib "list.ss"))
 
 (provide game@)
 (define game@ (unit (import) (export)

collects/games/memory/memory.ss

@@ -1,9 +1,5 @@
 #lang mzscheme
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/unit mzlib/list)
-         (lib "mred.ss" "mred")
-         (lib "class.ss")
-         (lib "unit.ss")
-         (lib "list.ss"))
 
 (provide game@)
 

collects/games/spider/spider.ss

@@ -1,11 +1,6 @@
 #lang mzscheme
 
-(require (lib "cards.ss" "games" "cards")
+(require games/cards mred mzlib/class mzlib/list mzlib/file mzlib/unit
-         (lib "class.ss")
-         (lib "mred.ss" "mred")
-         (lib "list.ss")
-         (lib "file.ss")
-         (lib "unit.ss")
          "../show-help.ss")
 
 (define (list-first-n l n)