bkyk8rc3zvpnsf5inmcqq4n3k98cv6hj-my-site-hyper-literate-git.test.suzanne.soy-0.0.1

commit e07b2159eb4c2db7433add3e83a5a4235a518178
parent fbd04f4e97a0201a014b4b36d27e0cf611bff724
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Thu,  8 Apr 2010 02:30:00 +0000

initial cut at HtDP languages via #lang; syntax/module-reader: split compiled-module info from reader info, reorganize and complete docs, don't export read-properties or get-info-getter for now

svn: r18759

original commit: b559c9db9b9828c4ee4593f3d3cb1896d27ce203

Diffstat:
M
collects/scribble/base/lang/reader.ss
 | 
13
++++---------
M
collects/scribble/doc/lang/reader.ss
 | 
28
+++++++++++-----------------
M
collects/scribble/doc/reader.ss
 | 
11
+----------
M
collects/scribble/jfp/lang/reader.ss
 | 
10
++++------
M
collects/scribble/lp/lang/reader.ss
 | 
5
++++-
M
collects/scribble/manual/lang/reader.ss
 | 
12
++++--------
M
collects/scribble/private/manual-scheme.ss
 | 
8
+++++---
M
collects/scribble/sigplan/lang/reader.ss
 | 
10
++++------

8 files changed, 37 insertions(+), 60 deletions(-)
diff --git a/collects/scribble/base/lang/reader.ss b/collects/scribble/base/lang/reader.ss
@@ -6,13 +6,8 @@ scribble/base/lang
 #:read-syntax scribble:read-syntax-inside
 #:whole-body-readers? #t
 #:wrapper1 (lambda (t) (list* 'doc 'values '() (t)))
-#:info
-(lambda (key defval default)
-  (case key
-    [(color-lexer)
-     (dynamic-require 'syntax-color/scribble-lexer 'scribble-inside-lexer)]
-    [(drscheme:toolbar-buttons)
-     (dynamic-require 'scribble/tools/drscheme-buttons 'drscheme-buttons)]
-    [else (default key defval)]))
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
 
-(require (prefix-in scribble: "../../reader.ss"))
+(require (prefix-in scribble: "../../reader.ss")
+         "../reader.ss")
diff --git a/collects/scribble/doc/lang/reader.ss b/collects/scribble/doc/lang/reader.ss
@@ -1,19 +1,13 @@
-#lang scheme/base
-(require (prefix-in doc: scribble/doc/reader))
-(provide (rename-out [doc:read read] 
-                     [my:read-syntax read-syntax])
-         get-info)
+#lang s-exp syntax/module-reader
 
-(define (my:read-syntax . args)
-  (let ([s (apply doc:read-syntax args)])
-    ;; For now, remove the 'module-language property added by `doc:read-syntax'
-    (syntax-property s 'module-language #f)))
+scribble/doclang
 
-(define (get-info . args)
-  (lambda (key defval)
-    (case key
-      [(color-lexer)
-       (dynamic-require 'syntax-color/scribble-lexer 'scribble-inside-lexer)]
-      [(drscheme:toolbar-buttons)
-       (dynamic-require 'scribble/tools/drscheme-buttons 'drscheme-buttons)]
-      [else defval])))
+#:read        scribble:read-inside
+#:read-syntax scribble:read-syntax-inside
+#:whole-body-readers? #t
+#:wrapper1 (lambda (t) (list* 'doc 'values '() (t)))
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
+
+(require (prefix-in scribble: "../../reader.ss")
+         scribble/base/reader)
diff --git a/collects/scribble/doc/reader.ss b/collects/scribble/doc/reader.ss
@@ -1,10 +1 @@
-#lang s-exp syntax/module-reader
-
-scribble/doclang
-
-#:read        scribble:read-inside
-#:read-syntax scribble:read-syntax-inside
-#:whole-body-readers? #t
-#:wrapper1 (lambda (t) (list* 'doc 'values '() (t)))
-
-(require (prefix-in scribble: "../reader.ss"))
+#lang scheme/base
diff --git a/collects/scribble/jfp/lang/reader.ss b/collects/scribble/jfp/lang/reader.ss
@@ -6,10 +6,8 @@ scribble/jfp/lang
 #:read-syntax scribble:read-syntax-inside
 #:whole-body-readers? #t
 #:wrapper1 (lambda (t) (cons 'doc (t)))
-#:info (lambda (key defval default)
-         (case key
-           [(color-lexer)
-            (dynamic-require 'syntax-color/scribble-lexer 'scribble-inside-lexer)]
-           [else (default key defval)]))
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
 
-(require (prefix-in scribble: "../../reader.ss"))
+(require (prefix-in scribble: "../../reader.ss")
+         scribble/base/reader)
diff --git a/collects/scribble/lp/lang/reader.ss b/collects/scribble/lp/lang/reader.ss
@@ -5,5 +5,8 @@ scribble/lp/lang/lang
 #:read read-inside
 #:read-syntax read-syntax-inside
 #:whole-body-readers? #t
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
 
-(require scribble/reader)
+(require scribble/reader
+         scribble/base/reader)
diff --git a/collects/scribble/manual/lang/reader.ss b/collects/scribble/manual/lang/reader.ss
@@ -6,12 +6,8 @@ scribble/manual/lang
 #:read-syntax scribble:read-syntax-inside
 #:whole-body-readers? #t
 #:wrapper1 (lambda (t) (cons 'doc (t)))
-#:info (lambda (key defval default)
-         (case key
-           [(color-lexer)
-            (dynamic-require 'syntax-color/scribble-lexer 'scribble-inside-lexer)]
-           [(drscheme:toolbar-buttons)
-            (dynamic-require 'scribble/tools/drscheme-buttons 'drscheme-buttons)]
-           [else (default key defval)]))
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
 
-(require (prefix-in scribble: "../../reader.ss"))
+(require (prefix-in scribble: "../../reader.ss")
+         scribble/base/reader)
diff --git a/collects/scribble/private/manual-scheme.ss b/collects/scribble/private/manual-scheme.ss
@@ -41,9 +41,11 @@
                                         #f
                                         (list (hash-lang)
                                               spacer
-                                              (as-modname-link
-                                               ',#'lang
-                                               (to-element ',#'lang)))))
+                                              ,(if (identifier? #'lang)
+                                                   `(as-modname-link
+                                                     ',#'lang
+                                                     (to-element ',#'lang))
+                                                   #'(scheme lang)))))
                             #'lang)]
                    [(file ...)
                     (if (syntax-e #'filename)
diff --git a/collects/scribble/sigplan/lang/reader.ss b/collects/scribble/sigplan/lang/reader.ss
@@ -6,10 +6,8 @@ scribble/sigplan/lang
 #:read-syntax scribble:read-syntax-inside
 #:whole-body-readers? #t
 #:wrapper1 (lambda (t) (cons 'doc (t)))
-#:info (lambda (key defval default)
-         (case key
-           [(color-lexer)
-            (dynamic-require 'syntax-color/scribble-lexer 'scribble-inside-lexer)]
-           [else (default key defval)]))
+#:module-info (scribble-base-module-info)
+#:info (scribble-base-info)
 
-(require (prefix-in scribble: "../../reader.ss"))
+(require (prefix-in scribble: "../../reader.ss")
+         scribble/base/reader)