From dbebe7b60a643a935f08f63fa0e00e6e79a9d10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Fri, 17 Jun 2016 20:19:09 +0200
Subject: [PATCH] Moved hyper-literate/typed to hyper-literate, as it is now
 parameterizable.

---
 typed/lang/lang.rkt => lang.rkt    | 4 ++--
 {typed/lang => lang}/reader.rkt    | 2 +-
 {typed/lang => private}/common.rkt | 5 ++---
 {typed/private => private}/lp.rkt  | 0
 test/test.hl.rkt                   | 2 +-
 test/test2.hl.rkt                  | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename typed/lang/lang.rkt => lang.rkt (70%)
 rename {typed/lang => lang}/reader.rkt (94%)
 rename {typed/lang => private}/common.rkt (98%)
 rename {typed/private => private}/lp.rkt (100%)

diff --git a/typed/lang/lang.rkt b/lang.rkt
similarity index 70%
rename from typed/lang/lang.rkt
rename to lang.rkt
index 4daed8bf..16c4fb76 100644
--- a/typed/lang/lang.rkt
+++ b/lang.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
 ;; Forked from scribble-lib/scribble/lp/lang/lang2.rkt
-(require "common.rkt")
+(require "private/common.rkt")
 
-(provide (except-out (all-from-out "common.rkt")
+(provide (except-out (all-from-out "private/common.rkt")
                      module-begin/plain
                      module-begin/doc)
          (rename-out [module-begin/doc #%module-begin]))
diff --git a/typed/lang/reader.rkt b/lang/reader.rkt
similarity index 94%
rename from typed/lang/reader.rkt
rename to lang/reader.rkt
index 1c4bf7c5..657149c2 100644
--- a/typed/lang/reader.rkt
+++ b/lang/reader.rkt
@@ -1,7 +1,7 @@
 #lang s-exp syntax/module-reader
 ;; Forked from scribble-lib/scribble/lp/lang/reader.rkt
 
-hyper-literate/typed/lang/lang
+hyper-literate/lang
 
 #:read read-inside
 #:read-syntax read-syntax-inside
diff --git a/typed/lang/common.rkt b/private/common.rkt
similarity index 98%
rename from typed/lang/common.rkt
rename to private/common.rkt
index 7a255a73..1a786e8f 100644
--- a/typed/lang/common.rkt
+++ b/private/common.rkt
@@ -126,7 +126,6 @@
 (define-syntax-parameter mbeg #'#%module-begin)
 
 (require (only-in typed/racket)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; WORKAROUND
-;(dynamic-require 'typed/racket 0)
 
 (define-for-syntax ((make-module-begin submod?) stx)
   (syntax-case stx ()
@@ -138,7 +137,7 @@
        (define lang-sym
          (string->symbol (regexp-replace "^ " (syntax-e #'lang) "")))
        (let ([expanded 
-              (expand `(,#'module scribble-lp-tmp-name hyper-literate/typed/private/lp
+              (expand `(,#'module scribble-lp-tmp-name hyper-literate/private/lp
                                   (define-syntax-rule (if-preexpanding a b) a)
                                   (define-syntax-rule (when-preexpanding . b) (begin . b))
                                   (define-syntax-rule (unless-preexpanding . b) (begin))
@@ -162,7 +161,7 @@
                                       (define-syntax-rule (when-preexpanding . b) (begin))
                                       (define-syntax-rule (unless-preexpanding . b) (begin . b))
                                       (require scribble/manual
-                                               (only-in hyper-literate/typed/private/lp chunk CHUNK))
+                                               (only-in hyper-literate/private/lp chunk CHUNK))
                                       (begin body0 . body)))])
                             (syntax-case submod ()
                               [(_ . rest)
diff --git a/typed/private/lp.rkt b/private/lp.rkt
similarity index 100%
rename from typed/private/lp.rkt
rename to private/lp.rkt
diff --git a/test/test.hl.rkt b/test/test.hl.rkt
index 31edce21..1847d999 100644
--- a/test/test.hl.rkt
+++ b/test/test.hl.rkt
@@ -1,4 +1,4 @@
-#lang hyper-literate/typed typed/racket/base
+#lang hyper-literate typed/racket/base
 
 @(require (for-label typed/racket/base
                      rackunit))
diff --git a/test/test2.hl.rkt b/test/test2.hl.rkt
index 58ca8bc0..b0191cf7 100644
--- a/test/test2.hl.rkt
+++ b/test/test2.hl.rkt
@@ -1,4 +1,4 @@
-#lang hyper-literate/typed typed/racket/base
+#lang hyper-literate typed/racket/base
 
 @(require (for-label typed/racket/base
                      typed/rackunit))