diff --git a/collects/scribble/base/lang/reader.ss b/collects/scribble/base/lang/reader.ss index 5604e5e1..9c2b200c 100644 --- a/collects/scribble/base/lang/reader.ss +++ b/collects/scribble/base/lang/reader.ss @@ -1,13 +1,3 @@ -#lang s-exp syntax/module-reader - +#lang s-exp scribble/base/reader scribble/base/lang - -#: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") - "../reader.ss") diff --git a/collects/scribble/doc/lang/reader.ss b/collects/scribble/doc/lang/reader.ss index 0ec18597..cf56c022 100644 --- a/collects/scribble/doc/lang/reader.ss +++ b/collects/scribble/doc/lang/reader.ss @@ -1,13 +1,3 @@ -#lang s-exp syntax/module-reader - +#lang s-exp scribble/base/reader scribble/doclang - -#: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/jfp/lang/reader.ss b/collects/scribble/jfp/lang/reader.ss index 66195985..09e0da56 100644 --- a/collects/scribble/jfp/lang/reader.ss +++ b/collects/scribble/jfp/lang/reader.ss @@ -1,13 +1,3 @@ -#lang s-exp syntax/module-reader - +#lang s-exp scribble/base/reader scribble/jfp/lang - -#:read scribble:read-inside -#:read-syntax scribble:read-syntax-inside -#:whole-body-readers? #t #:wrapper1 (lambda (t) (cons 'doc (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/lp/lang/reader.ss b/collects/scribble/lp/lang/reader.ss index b7eb4930..84961b2d 100644 --- a/collects/scribble/lp/lang/reader.ss +++ b/collects/scribble/lp/lang/reader.ss @@ -5,8 +5,12 @@ 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) +#:module-info (scribble-base-module-info) (require scribble/reader - scribble/base/reader) + (only-in scribble/base/reader + scribble-base-info + scribble-base-module-info)) + + diff --git a/collects/scribble/manual/lang/reader.ss b/collects/scribble/manual/lang/reader.ss index 28954057..ec831697 100644 --- a/collects/scribble/manual/lang/reader.ss +++ b/collects/scribble/manual/lang/reader.ss @@ -1,13 +1,3 @@ -#lang s-exp syntax/module-reader - +#lang s-exp scribble/base/reader scribble/manual/lang - -#:read scribble:read-inside -#:read-syntax scribble:read-syntax-inside -#:whole-body-readers? #t #:wrapper1 (lambda (t) (cons 'doc (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/sigplan/lang/reader.ss b/collects/scribble/sigplan/lang/reader.ss index b029bbaa..3963d6e5 100644 --- a/collects/scribble/sigplan/lang/reader.ss +++ b/collects/scribble/sigplan/lang/reader.ss @@ -1,13 +1,3 @@ -#lang s-exp syntax/module-reader - +#lang s-exp scribble/base/reader scribble/sigplan/lang - -#:read scribble:read-inside -#:read-syntax scribble:read-syntax-inside -#:whole-body-readers? #t #:wrapper1 (lambda (t) (cons 'doc (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/text/lang/reader.ss b/collects/scribble/text/lang/reader.ss index 245b6282..d9660753 100644 --- a/collects/scribble/text/lang/reader.ss +++ b/collects/scribble/text/lang/reader.ss @@ -5,5 +5,8 @@ scribble/text/textlang #:read scribble:read-inside #:read-syntax scribble:read-syntax-inside #:whole-body-readers? #t +#:info (scribble-base-reader-info) -(require (prefix-in scribble: "../../reader.ss")) +(require (prefix-in scribble: "../../reader.ss") + (only-in scribble/base/reader + scribble-base-reader-info))