diff --git a/collects/scribblings/scribble/base.scrbl b/collects/scribblings/scribble/base.scrbl index 2f192b3b..7c7f750f 100644 --- a/collects/scribblings/scribble/base.scrbl +++ b/collects/scribblings/scribble/base.scrbl @@ -1,6 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" +@(require scribble/manual "utils.rkt" (for-syntax racket/base) (for-label setup/main-collects)) diff --git a/collects/scribblings/scribble/basic.scrbl b/collects/scribblings/scribble/basic.scrbl index 2b94d9f6..1fffc268 100644 --- a/collects/scribblings/scribble/basic.scrbl +++ b/collects/scribblings/scribble/basic.scrbl @@ -1,6 +1,5 @@ #lang scribble/manual -@(require "utils.ss" - (for-label (only-in scribble/basic span-class))) +@(require "utils.rkt" (for-label (only-in scribble/basic span-class))) @(define (compat) @italic{For backward compatibility.}) diff --git a/collects/scribblings/scribble/bnf.scrbl b/collects/scribblings/scribble/bnf.scrbl index 84aa60d8..4ea8e74c 100644 --- a/collects/scribblings/scribble/bnf.scrbl +++ b/collects/scribblings/scribble/bnf.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" - scribble/bnf +@(require scribble/manual "utils.rkt" scribble/bnf (for-label scribble/bnf)) @title[#:tag "bnf"]{BNF Grammars} diff --git a/collects/scribblings/scribble/config.scrbl b/collects/scribblings/scribble/config.scrbl index 9db62869..236177da 100644 --- a/collects/scribblings/scribble/config.scrbl +++ b/collects/scribblings/scribble/config.scrbl @@ -1,10 +1,7 @@ #lang scribble/doc -@(require scribble/manual - scribble/core - scribble/decode - scribble/html-properties - scribble/latex-properties - "utils.ss" +@(require scribble/manual scribble/core scribble/decode + scribble/html-properties scribble/latex-properties + "utils.rkt" (for-label racket/base)) @(define (fake-title . str) (apply bold str)) diff --git a/collects/scribblings/scribble/core.scrbl b/collects/scribblings/scribble/core.scrbl index ec15cd36..b97e4714 100644 --- a/collects/scribblings/scribble/core.scrbl +++ b/collects/scribblings/scribble/core.scrbl @@ -1,6 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" +@(require scribble/manual "utils.rkt" (for-label scribble/manual-struct file/convertible setup/main-collects diff --git a/collects/scribblings/scribble/decode.scrbl b/collects/scribblings/scribble/decode.scrbl index ae2e2b6e..0baa5136 100644 --- a/collects/scribblings/scribble/decode.scrbl +++ b/collects/scribblings/scribble/decode.scrbl @@ -1,6 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss") +@(require scribble/manual "utils.rkt") @title[#:tag "decode"]{Decoding Text} diff --git a/collects/scribblings/scribble/doclang.scrbl b/collects/scribblings/scribble/doclang.scrbl index 062d7e3b..9263de76 100644 --- a/collects/scribblings/scribble/doclang.scrbl +++ b/collects/scribblings/scribble/doclang.scrbl @@ -1,5 +1,5 @@ #lang scribble/manual -@(require "utils.ss") +@(require "utils.rkt") @title[#:tag "doclang"]{Document Language} diff --git a/collects/scribblings/scribble/docreader.scrbl b/collects/scribblings/scribble/docreader.scrbl index 19f9acb8..3bcd6237 100644 --- a/collects/scribblings/scribble/docreader.scrbl +++ b/collects/scribblings/scribble/docreader.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - "utils.ss") +@(require scribble/manual scribble/bnf "utils.rkt") @title[#:tag "docreader"]{Document Reader} diff --git a/collects/scribblings/scribble/eval.scrbl b/collects/scribblings/scribble/eval.scrbl index a71ea382..9874bca7 100644 --- a/collects/scribblings/scribble/eval.scrbl +++ b/collects/scribblings/scribble/eval.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" - (for-label racket/sandbox)) +@(require scribble/manual "utils.rkt" (for-label racket/sandbox)) @title[#:tag "eval"]{Evaluation and Examples} diff --git a/collects/scribblings/scribble/generic.scrbl b/collects/scribblings/scribble/generic.scrbl index 36e38454..2522c260 100644 --- a/collects/scribblings/scribble/generic.scrbl +++ b/collects/scribblings/scribble/generic.scrbl @@ -1,5 +1,5 @@ #lang scribble/manual -@(require "utils.ss") +@(require "utils.rkt") @title[#:tag "generic-prose" #:style 'toc]{High-Level Scribble API} @@ -10,4 +10,3 @@ @include-section["sigplan.scrbl"] @include-section["jfp.scrbl"] @include-section["lncs.scrbl"] - diff --git a/collects/scribblings/scribble/how-to-paper.scrbl b/collects/scribblings/scribble/how-to-paper.scrbl index 99d9001a..944ea0fc 100644 --- a/collects/scribblings/scribble/how-to-paper.scrbl +++ b/collects/scribblings/scribble/how-to-paper.scrbl @@ -1,16 +1,11 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - "utils.ss" - (for-label scriblib/figure - scribble/base - scribble/sigplan)) +@(require scribble/manual scribble/bnf "utils.rkt" + (for-label scriblib/figure scribble/base scribble/sigplan)) @(define-syntax-rule (samplemod . text) (codeblock . text)) -@(define-syntax-rule (sample a . text) (codeblock #:context #'a - #:keep-lang-line? #f - "#lang scribble/base" "\n" - a . text)) +@(define-syntax-rule (sample a . text) + (codeblock #:context #'a #:keep-lang-line? #f + "#lang scribble/base" "\n" a . text)) @(define (result . text) (apply nested #:style 'inset text)) @title[#:tag "getting-started"]{Getting Started} diff --git a/collects/scribblings/scribble/how-to.scrbl b/collects/scribblings/scribble/how-to.scrbl index 2ef05321..38dee8c6 100644 --- a/collects/scribblings/scribble/how-to.scrbl +++ b/collects/scribblings/scribble/how-to.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - "utils.ss") +@(require scribble/manual scribble/bnf "utils.rkt") @title[#:tag "how-to-doc"]{Getting Started with Documentation} diff --git a/collects/scribblings/scribble/internals.scrbl b/collects/scribblings/scribble/internals.scrbl index 3fd83800..05b52b04 100644 --- a/collects/scribblings/scribble/internals.scrbl +++ b/collects/scribblings/scribble/internals.scrbl @@ -1,5 +1,5 @@ #lang scribble/manual -@(require "utils.ss") +@(require "utils.rkt") @title[#:tag "internals" #:style 'toc]{Low-Level Scribble API} @@ -14,4 +14,4 @@ @include-section["docreader.scrbl"] @include-section["xref.scrbl"] @include-section["config.scrbl"] -@include-section["racket.scrbl"] \ No newline at end of file +@include-section["racket.scrbl"] diff --git a/collects/scribblings/scribble/jfp.scrbl b/collects/scribblings/scribble/jfp.scrbl index 06e89fa7..b833fce9 100644 --- a/collects/scribblings/scribble/jfp.scrbl +++ b/collects/scribblings/scribble/jfp.scrbl @@ -1,6 +1,5 @@ #lang scribble/manual -@(require (except-in "utils.ss" author) - (for-label scribble/jfp)) +@(require (except-in "utils.rkt" author) (for-label scribble/jfp)) @(define-syntax-rule (def base-author) (begin diff --git a/collects/scribblings/scribble/layers.scrbl b/collects/scribblings/scribble/layers.scrbl index 5583ef34..ab313015 100644 --- a/collects/scribblings/scribble/layers.scrbl +++ b/collects/scribblings/scribble/layers.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - "utils.ss") +@(require scribble/manual scribble/bnf "utils.rkt") @title[#:tag "layers"]{Scribble Layers} diff --git a/collects/scribblings/scribble/lncs.scrbl b/collects/scribblings/scribble/lncs.scrbl index ce45e280..222accc1 100644 --- a/collects/scribblings/scribble/lncs.scrbl +++ b/collects/scribblings/scribble/lncs.scrbl @@ -1,7 +1,6 @@ #lang scribble/manual -@(require (except-in "utils.ss" author) - (except-in (for-label scribble/lncs/lang) - #%module-begin)) +@(require (except-in "utils.rkt" author) + (except-in (for-label scribble/lncs/lang) #%module-begin)) @(define-syntax-rule (def base-author) (begin diff --git a/collects/scribblings/scribble/lp.scrbl b/collects/scribblings/scribble/lp.scrbl index a876995b..e210a9e5 100644 --- a/collects/scribblings/scribble/lp.scrbl +++ b/collects/scribblings/scribble/lp.scrbl @@ -1,14 +1,12 @@ #lang scribble/doc -@(require scribble/manual - scribble/core - scribble/html-properties +@(require scribble/manual scribble/core scribble/html-properties scribble/latex-properties racket/runtime-path + "utils.rkt" (prefix-in lp-ex: "lp-ex-doc.scrbl") - "utils.ss" (for-label scribble/lp-include scribble/lp)) -@title[#:tag "lp" +@title[#:tag "lp" #:style (make-style #f (list (make-css-addition "lp.css") (make-tex-addition "lp.tex"))) diff --git a/collects/scribblings/scribble/manual-stub.scrbl b/collects/scribblings/scribble/manual-stub.scrbl index b373d528..c8a15369 100644 --- a/collects/scribblings/scribble/manual-stub.scrbl +++ b/collects/scribblings/scribble/manual-stub.scrbl @@ -1,6 +1,5 @@ #lang scribble/manual -@(require "utils.ss" - (for-label scribble/sigplan)) +@(require "utils.rkt" (for-label scribble/sigplan)) @title{Racket Manual Format} diff --git a/collects/scribblings/scribble/manual.scrbl b/collects/scribblings/scribble/manual.scrbl index 11603092..b2941062 100644 --- a/collects/scribblings/scribble/manual.scrbl +++ b/collects/scribblings/scribble/manual.scrbl @@ -1,6 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" +@(require scribble/manual "utils.rkt" (for-syntax racket/base) (for-label scribble/manual-struct)) diff --git a/collects/scribblings/scribble/plt.scrbl b/collects/scribblings/scribble/plt.scrbl index 2d79866b..403b94ae 100644 --- a/collects/scribblings/scribble/plt.scrbl +++ b/collects/scribblings/scribble/plt.scrbl @@ -1,5 +1,5 @@ #lang scribble/manual -@(require "utils.ss") +@(require "utils.rkt") @title[#:tag "plt-manuals" #:style 'toc]{Scribbling Documentation} diff --git a/collects/scribblings/scribble/preprocessor.scrbl b/collects/scribblings/scribble/preprocessor.scrbl index 187768cd..2d23fe0f 100644 --- a/collects/scribblings/scribble/preprocessor.scrbl +++ b/collects/scribblings/scribble/preprocessor.scrbl @@ -1,7 +1,7 @@ #lang scribble/doc @(require scribble/manual scribble/core scribble/html-properties scribble/latex-properties - "utils.ss" + "utils.rkt" (for-label racket/base ;; FIXME: need to get this in ;; scribble/text diff --git a/collects/scribblings/scribble/reader-internals.scrbl b/collects/scribblings/scribble/reader-internals.scrbl index 8ad09806..45fc40f6 100644 --- a/collects/scribblings/scribble/reader-internals.scrbl +++ b/collects/scribblings/scribble/reader-internals.scrbl @@ -1,8 +1,5 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - scribble/eval - "utils.ss" +@(require scribble/manual scribble/bnf scribble/eval "utils.rkt" (for-syntax racket/base) (for-label (only-in scribble/reader use-at-readtable))) @@ -196,7 +193,7 @@ for reading. These @racketid[-inside] variants parse as if starting inside a @litchar["@{"]...@litchar["}"], and they return a (syntactic) list. Useful for implementing languages that are textual by default (see -@filepath{docreader.ss} for example). +@filepath{docreader.rkt} for example). } @defproc[(make-at-readtable diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl index 90332148..d84bccc2 100644 --- a/collects/scribblings/scribble/reader.scrbl +++ b/collects/scribblings/scribble/reader.scrbl @@ -1,8 +1,5 @@ #lang scribble/doc -@(require scribble/manual - scribble/bnf - scribble/eval - "utils.ss" +@(require scribble/manual scribble/bnf scribble/eval "utils.rkt" (for-syntax racket/base) (for-label (only-in scribble/reader use-at-readtable))) diff --git a/collects/scribblings/scribble/renderer.scrbl b/collects/scribblings/scribble/renderer.scrbl index 24950387..5b1db332 100644 --- a/collects/scribblings/scribble/renderer.scrbl +++ b/collects/scribblings/scribble/renderer.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" - (for-label racket/class)) +@(require scribble/manual "utils.rkt" (for-label racket/class)) @(define-syntax-rule (defmodule/local lib . content) (begin diff --git a/collects/scribblings/scribble/scheme.scrbl b/collects/scribblings/scribble/scheme.scrbl index 3015f9d0..abf9b77b 100644 --- a/collects/scribblings/scribble/scheme.scrbl +++ b/collects/scribblings/scribble/scheme.scrbl @@ -1,7 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" - (for-label scribble/racket)) +@(require scribble/manual "utils.rkt" (for-label scribble/racket)) @title[#:tag "scheme"]{Racket} diff --git a/collects/scribblings/scribble/scribble.scrbl b/collects/scribblings/scribble/scribble.scrbl index 493f97ae..b451ecb3 100644 --- a/collects/scribblings/scribble/scribble.scrbl +++ b/collects/scribblings/scribble/scribble.scrbl @@ -1,6 +1,5 @@ #lang scribble/manual -@(require scribble/bnf - "utils.ss") +@(require scribble/bnf "utils.rkt") @title{@bold{Scribble}: Racket Documentation Tool} diff --git a/collects/scribblings/scribble/sigplan.scrbl b/collects/scribblings/scribble/sigplan.scrbl index bf8b2465..522e3572 100644 --- a/collects/scribblings/scribble/sigplan.scrbl +++ b/collects/scribblings/scribble/sigplan.scrbl @@ -1,6 +1,5 @@ #lang scribble/manual -@(require "utils.ss" - (for-label scribble/sigplan)) +@(require "utils.rkt" (for-label scribble/sigplan)) @title{SIGPLAN Paper Format} diff --git a/collects/scribblings/scribble/srcdoc.scrbl b/collects/scribblings/scribble/srcdoc.scrbl index 20c37d07..88b3b499 100644 --- a/collects/scribblings/scribble/srcdoc.scrbl +++ b/collects/scribblings/scribble/srcdoc.scrbl @@ -1,9 +1,6 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" - (for-label scribble/srcdoc - scribble/extract - racket/contract)) +@(require scribble/manual "utils.rkt" + (for-label scribble/srcdoc scribble/extract racket/contract)) @title[#:tag "srcdoc"]{In-Source Documentation} diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl index 1fc67631..4aa9c8d9 100644 --- a/collects/scribblings/scribble/struct.scrbl +++ b/collects/scribblings/scribble/struct.scrbl @@ -1,5 +1,5 @@ #lang scribble/manual -@(require (except-in "utils.ss" +@(require (except-in "utils.rkt" make-part make-paragraph make-table make-itemization make-compound-paragraph make-element make-toc-element make-target-element make-toc-target-element make-page-target-element make-redirect-target-element make-link-element @@ -13,7 +13,7 @@ setup/main-collects)) @(define (compat) @italic{For backward compatibility.}) -@(define-syntax-rule (compat/comp id) +@(define-syntax-rule (compat/comp id) @elem{@compat[] Compared to the normal constructor for @racket[id]}) @title[#:tag "struct"]{Compatibility Structures And Processing} diff --git a/collects/scribblings/scribble/style.scrbl b/collects/scribblings/scribble/style.scrbl index cec4848c..e8e51bec 100644 --- a/collects/scribblings/scribble/style.scrbl +++ b/collects/scribblings/scribble/style.scrbl @@ -1,9 +1,6 @@ #lang scribble/doc -@(require scribble/manual - scribble/eval - "utils.ss" - (for-label scribble/manual - scribble/eval)) +@(require scribble/manual scribble/eval "utils.rkt" + (for-label scribble/manual scribble/eval)) @title[#:tag "reference-style"]{Style Guide} diff --git a/collects/scribblings/scribble/xref.scrbl b/collects/scribblings/scribble/xref.scrbl index ccd353cc..752be734 100644 --- a/collects/scribblings/scribble/xref.scrbl +++ b/collects/scribblings/scribble/xref.scrbl @@ -1,6 +1,5 @@ #lang scribble/doc -@(require scribble/manual - "utils.ss" +@(require scribble/manual "utils.rkt" (for-label scribble/xref scribble/base-render scribble/html-render