simplify

hyphenate/fr.rkt

@@ -1,3 +0,0 @@
-#lang racket/base
-(require hyphenate/bootstrap)
-(build-main fr)

hyphenate/fr/exceptions.rkt

@@ -1 +0,0 @@
-#lang hyphenate/exception-prep

hyphenate/hyphenate/fr.rkt

@@ -0,0 +1,3 @@
+#lang racket/base
+(require "private/bootstrap.rkt")
+(build-main fr)

hyphenate/hyphenate/fr/exceptions.rkt

@@ -0,0 +1 @@
+#lang hyphenate/private/exception-prep

hyphenate/hyphenate/fr/patterns.rkt

@@ -1,4 +1,4 @@
-#lang hyphenate/pattern-prep
+#lang hyphenate/private/pattern-prep
 
 #|
 

hyphenate/hyphenate/private/bootstrap.rkt

@@ -5,13 +5,13 @@
 (define-syntax (build-main stx)
   (syntax-case stx () 
     [(_ dir)
-     (with-syntax ([patterns-path (datum->syntax stx (format "~a/patterns.rkt" (syntax->datum #'dir)))]
+     (with-syntax ([patterns-path (format "~a/patterns.rkt" (syntax->datum #'dir))]
-                   [exceptions-path (datum->syntax stx (format "~a/exceptions.rkt" (syntax->datum #'dir)))])
+                   [exceptions-path (format "~a/exceptions.rkt" (syntax->datum #'dir))])
        (replace-context stx
                         #'(begin
-                            (require txexpr sugar/define (only-in xml xexpr/c)
+                            (require txexpr/base sugar/define (only-in xml xexpr/c)
-                                     (prefix-in core: hyphenate/core) hyphenate/params patterns-path exceptions-path)
+                                     (prefix-in core: hyphenate/private/core) hyphenate/private/params patterns-path exceptions-path)
-                            (provide (all-from-out hyphenate/params))
+                            (provide (all-from-out hyphenate/private/params))
 
                             (module+ safe
                               ;; An exception-word is a string of word characters or hyphens.

hyphenate/hyphenate/private/core.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require txexpr racket/string racket/list "params.rkt")
+(require txexpr/base racket/string racket/list "params.rkt")
 (provide hyphenate unhyphenate word->hyphenation-points convert-exception-word string->hashpair)
 
 ;; module default values
@@ -143,7 +143,7 @@
        (make-txexpr (get-tag x) (get-attrs x) (map loop (get-elements x)))]
       [else x])))
 
-(require sugar/debug)
+
 (define (hyphenate x [joiner default-joiner] 
                    #:exceptions [extra-exceptions empty]  
                    #:min-length [min-length default-min-length]

hyphenate/hyphenate/private/exception-prep.rkt

@@ -12,6 +12,6 @@
     (with-syntax ([str (port->string in)])
       (strip-context
        #'(module exception-prep racket/base
-           (require racket/string racket/list hyphenate/core)
+           (require racket/string racket/list hyphenate/private/core)
            (provide exceptions)
            (define exceptions (apply hash (append-map convert-exception-word (string-split str)))))))))

hyphenate/hyphenate/private/pattern-prep.rkt

@@ -12,6 +12,6 @@
     (with-syntax ([str (port->string in)])
       (strip-context
        #'(module pattern-prep racket/base
-           (require hyphenate/core racket/list racket/string)
+           (require hyphenate/private/core racket/list racket/string)
            (provide patterns)
            (define patterns (apply hash (append-map string->hashpair (string-split str)))))))))

hyphenate/hyphenate/tests.rkt

@@ -1,5 +1,5 @@
 #lang racket/base
-(require (submod hyphenate safe) txexpr rackunit)
+(require (submod hyphenate safe) txexpr/base rackunit)
 
 (define omit-em-tag (λ(x) (member (car x) '(em))))
 (define omit-p-tag (λ(x) (member (car x) '(p))))

hyphenate/hyphenate/us.rkt

@@ -0,0 +1,3 @@
+#lang racket/base
+(require "private/bootstrap.rkt")
+(build-main us)

hyphenate/hyphenate/us/exceptions.rkt

@@ -1,4 +1,4 @@
-#lang hyphenate/exception-prep
+#lang hyphenate/private/exception-prep
 as-so-ciate
 as-so-ciates
 dec-li-na-tion

hyphenate/info.rkt

@@ -1,8 +1,8 @@
 #lang info
-(define version "0.1")
+(define version "0.2")
-(define collection "hyphenate")
+(define collection 'multi)
-(define deps '("base" "sugar" "txexpr" "rackunit-lib"))
+(define deps '("base" ["sugar" #:version "0.2"] ["txexpr" #:version "0.2"]))
 (define update-implies '("txexpr" "sugar"))
-(define build-deps '("scribble-lib" "racket-doc"))
+(define build-deps '("scribble-lib" "racket-doc" "rackunit-lib"))
-(define scribblings '(("scribblings/hyphenate.scrbl" ())))
+(define scribblings '(("hyphenate/scribblings/hyphenate.scrbl" ())))
-(define compile-omit-paths '("tests.rkt"))
+(define compile-omit-paths '("hyphenate/tests.rkt"))

hyphenate/us.rkt

@@ -1,3 +0,0 @@
-#lang racket/base
-(require hyphenate/bootstrap)
-(build-main us)