From b79fa2c540606b63dcfee545f1e16e97ffd432c4 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 24 May 2013 21:57:31 -0600 Subject: [PATCH] reorganize into core plus packages The "racket" directory contains a pared-back version of the repository, roughly. The "pkgs" directory everything else in the repository, but organized into packages. original commit: b2ebb0a28bf8136e75cd98316c22fe54c30eacb2 --- .../racket-doc}/scriblib/autobib.css | 0 .../racket-doc}/scriblib/autobib.rkt | 0 .../racket-doc}/scriblib/autobib.tex | 0 .../racket-doc}/scriblib/bibtex.rkt | 0 .../racket-doc}/scriblib/figure.css | 0 .../racket-doc}/scriblib/figure.rkt | 0 .../racket-doc}/scriblib/figure.tex | 0 .../racket-doc}/scriblib/footnote.css | 0 .../racket-doc}/scriblib/footnote.rkt | 0 .../racket-doc}/scriblib/footnote.tex | 0 .../racket-doc}/scriblib/gui-eval.rkt | 0 .../racket-pkgs/racket-doc}/scriblib/info.rkt | 0 .../racket-doc}/scriblib/private/counter.rkt | 0 .../scriblib/private/gui-eval-exn.rkt | 0 .../racket-doc}/scriblib/render-cond.rkt | 0 .../scriblib/scribblings/autobib.scrbl | 0 .../scriblib/scribblings/bibtex.scrbl | 0 .../scriblib/scribblings/figure.scrbl | 0 .../scriblib/scribblings/footnote.scrbl | 0 .../scriblib/scribblings/gui-eval.scrbl | 0 .../racket-doc}/scriblib/scribblings/info.rkt | 0 .../scriblib/scribblings/render-cond.scrbl | 0 .../scriblib/scribblings/scriblib.scrbl | 0 .../racket-test}/tests/scribble/decode.rkt | 0 .../racket-test}/tests/scribble/docs.rkt | 0 .../tests/scribble/docs/autobib-broken.scrbl | 0 .../tests/scribble/docs/autobib-broken.txt | 0 .../docs/autobib-disambiguation-corner.scrbl | 0 .../docs/autobib-disambiguation-corner.txt | 0 .../docs/autobib-disambiguation-more.scrbl | 0 .../docs/autobib-disambiguation-more.txt | 0 .../docs/autobib-disambiguation.scrbl | 0 .../scribble/docs/autobib-disambiguation.txt | 0 .../scribble/docs/autobib-numbered.scrbl | 0 .../tests/scribble/docs/autobib-numbered.txt | 0 .../tests/scribble/docs/autobib-order.scrbl | 0 .../tests/scribble/docs/autobib-order.txt | 0 .../tests/scribble/docs/autobib.scrbl | 0 .../tests/scribble/docs/autobib.txt | 0 .../tests/scribble/docs/codeblock-quote.scrbl | 0 .../tests/scribble/docs/codeblock-quote.txt | 0 .../tests/scribble/docs/codeblock-utf8.scrbl | 0 .../tests/scribble/docs/codeblock-utf8.txt | 0 .../tests/scribble/docs/cond.scrbl | 0 .../racket-test}/tests/scribble/docs/cond.txt | 0 .../tests/scribble/docs/decode.scrbl | 0 .../tests/scribble/docs/decode.txt | 0 .../tests/scribble/docs/diamond.rkt | 0 .../tests/scribble/docs/diamond.scrbl | 0 .../tests/scribble/docs/diamond.txt | 0 .../scribble/docs/empty-onthispage.scrbl | 0 .../tests/scribble/docs/empty-onthispage.txt | 0 .../tests/scribble/docs/eval-false.scrbl | 0 .../tests/scribble/docs/eval-false.txt | 0 .../tests/scribble/docs/eval-special.scrbl | 0 .../tests/scribble/docs/eval-special.txt | 0 .../tests/scribble/docs/figure.scrbl | 0 .../tests/scribble/docs/figure.txt | 0 .../tests/scribble/docs/filebox.scrbl | 0 .../tests/scribble/docs/filebox.txt | 0 .../tests/scribble/docs/footnote.scrbl | 0 .../tests/scribble/docs/footnote.txt | 0 .../tests/scribble/docs/grouper-sub.scrbl | 0 .../tests/scribble/docs/grouper-sub.txt | 0 .../tests/scribble/docs/grouper.scrbl | 0 .../tests/scribble/docs/grouper.txt | 0 .../tests/scribble/docs/itemlist.scrbl | 0 .../tests/scribble/docs/itemlist.txt | 0 .../tests/scribble/docs/manual-ex.rkt | 0 .../tests/scribble/docs/manual.scrbl | 0 .../tests/scribble/docs/manual.txt | 0 .../tests/scribble/docs/print-lines.scrbl | 0 .../tests/scribble/docs/print-lines.txt | 0 .../tests/scribble/docs/read-alts.scrbl | 0 .../tests/scribble/docs/read-alts.txt | 0 .../tests/scribble/docs/stxobj.scrbl | 0 .../tests/scribble/docs/stxobj.txt | 0 .../tests/scribble/docs/tech.scrbl | 0 .../racket-test}/tests/scribble/docs/tech.txt | 0 .../tests/scribble/docs/text.scrbl | 0 .../racket-test}/tests/scribble/docs/text.txt | 0 .../tests/scribble/docs/wrap.scrbl | 0 .../racket-test}/tests/scribble/docs/wrap.txt | 0 .../racket-test}/tests/scribble/main.rkt | 0 .../tests/scribble/markdown-docs/example.md | 0 .../scribble/markdown-docs/example.scrbl | 0 .../racket-test}/tests/scribble/markdown.rkt | 0 .../racket-test}/tests/scribble/reader.rkt | 0 .../racket-test}/tests/scribble/render.rkt | 0 .../tests/scribble/text-collect.rkt | 0 .../racket-test}/tests/scribble/text-lang.rkt | 0 .../racket-test}/tests/scribble/text-wrap.rkt | 0 .../racket-test}/tests/scribble/xref.rkt | 0 .../tests/scriblib/bibtex.normal.txt | 0 .../tests/scriblib/bibtex.number.txt | 0 .../racket-test}/tests/scriblib/bibtex.rkt | 0 .../racket-test}/tests/scriblib/example.bib | 0 pkgs/scribble-pkgs/scribble-doc/info.rkt | 4 + .../scribblings/scribble/base.scrbl | 0 .../scribblings/scribble/basic.scrbl | 0 .../scribblings/scribble/bnf.scrbl | 0 .../scribblings/scribble/book.scrbl | 0 .../scribblings/scribble/class-diagrams.rkt | 0 .../scribblings/scribble/compat.scrbl | 0 .../scribblings/scribble/config.scrbl | 0 .../scribblings/scribble/core.scrbl | 0 .../scribblings/scribble/decode.scrbl | 0 .../scribblings/scribble/doclang.scrbl | 0 .../scribblings/scribble/docreader.scrbl | 0 .../scribblings/scribble/eval.scrbl | 0 .../scribblings/scribble/generic.scrbl | 0 .../scribble/getting-started.scrbl | 0 .../scribblings/scribble/how-to-paper.scrbl | 0 .../scribblings/scribble/how-to.scrbl | 0 .../scribblings/scribble/inbox.css | 0 .../scribblings/scribble/inbox.tex | 0 .../scribblings/scribble/info.rkt | 0 .../scribblings/scribble/internals.scrbl | 0 .../scribblings/scribble/jfp.scrbl | 0 .../scribblings/scribble/layers.scrbl | 0 .../scribblings/scribble/lncs.scrbl | 0 .../scribblings/scribble/lp-ex-doc.scrbl | 0 .../scribblings/scribble/lp-ex.rkt | 0 .../scribble-doc}/scribblings/scribble/lp.css | 0 .../scribblings/scribble/lp.scrbl | 0 .../scribble-doc}/scribblings/scribble/lp.tex | 0 .../scribblings/scribble/manual-stub.scrbl | 0 .../scribblings/scribble/manual.scrbl | 0 .../scribblings/scribble/plt.scrbl | 0 .../scribble/reader-internals.scrbl | 0 .../scribblings/scribble/reader.scrbl | 0 .../scribblings/scribble/renderer.scrbl | 0 .../scribblings/scribble/report.scrbl | 0 .../scribblings/scribble/running.scrbl | 0 .../scribblings/scribble/scheme.scrbl | 0 .../scribblings/scribble/scribble.scrbl | 0 .../scribblings/scribble/shaded.css | 0 .../scribblings/scribble/shaded.tex | 0 .../scribblings/scribble/sigplan.scrbl | 0 .../scribblings/scribble/srcdoc.scrbl | 0 .../scribblings/scribble/struct-hierarchy.rkt | 0 .../scribblings/scribble/struct.scrbl | 0 .../scribblings/scribble/style.scrbl | 0 .../scribblings/scribble/tag.scrbl | 0 .../scribblings/scribble/text.scrbl | 0 .../scribblings/scribble/utils.rkt | 0 .../scribblings/scribble/xref.scrbl | 0 pkgs/scribble-pkgs/scribble-lib/info.rkt | 5 + .../scribble-lib}/scribble/base-render.rkt | 102 ++++++++++++------ .../scribble-lib}/scribble/base.rkt | 22 +++- .../scribble-lib}/scribble/base/lang.rkt | 0 .../scribble/base/lang/reader.rkt | 0 .../scribble-lib}/scribble/basic.rkt | 0 .../scribble-lib}/scribble/bnf.rkt | 0 .../scribble-lib}/scribble/book/lang.rkt | 0 .../scribble/book/lang/reader.rkt | 0 .../scribble-lib}/scribble/book/style.tex | 0 .../scribble-lib}/scribble/comment-reader.rkt | 0 .../scribble-lib}/scribble/config.rkt | 0 .../scribble/contract-render.rkt | 0 .../scribble-lib}/scribble/core.rkt | 0 .../scribble-lib}/scribble/decode-struct.rkt | 0 .../scribble-lib}/scribble/decode.rkt | 0 .../scribble-lib}/scribble/doc.txt | 0 .../scribble/doc/lang/reader.rkt | 0 .../scribble-lib}/scribble/doc/main.rkt | 0 .../scribble-lib}/scribble/doc/reader.rkt | 0 .../scribble-lib}/scribble/doclang.rkt | 0 .../scribble-lib}/scribble/doclang2.rkt | 0 .../scribble-lib}/scribble/eval.rkt | 0 .../scribble-lib}/scribble/extract.rkt | 0 .../scribble/html-properties.rkt | 3 + .../scribble-lib}/scribble/html-render.rkt | 86 +++++++++++---- .../scribble-lib}/scribble/html.rkt | 0 .../scribble-lib}/scribble/html/html.rkt | 0 .../scribble-lib}/scribble/html/lang.rkt | 0 .../scribble/html/lang/reader.rkt | 0 .../scribble-lib}/scribble/html/main.rkt | 0 .../scribble-lib}/scribble/html/resource.rkt | 0 .../scribble-lib}/scribble/html/xml.rkt | 0 .../scribble-lib}/scribble/info.rkt | 0 .../scribble-lib}/scribble/jfp.rkt | 0 .../scribble-lib}/scribble/jfp/.gitignore | 0 .../scribble-lib}/scribble/jfp/jfp.css | 0 .../scribble-lib}/scribble/jfp/jfp.tex | 0 .../scribble-lib}/scribble/jfp/lang.rkt | 0 .../scribble/jfp/lang/reader.rkt | 0 .../scribble-lib}/scribble/jfp/style.tex | 0 .../scribble-lib}/scribble/latex-prefix.rkt | 0 .../scribble/latex-properties.rkt | 0 .../scribble-lib}/scribble/latex-render.rkt | 0 .../scribble-lib}/scribble/lncs/.gitignore | 0 .../scribble-lib}/scribble/lncs/lang.rkt | 0 .../scribble/lncs/lang/reader.rkt | 0 .../scribble-lib}/scribble/lncs/lncs.tex | 0 .../scribble-lib}/scribble/lncs/style.tex | 0 .../scribble-lib}/scribble/lp-include.rkt | 0 .../scribble-lib}/scribble/lp.rkt | 0 .../scribble-lib}/scribble/lp/lang/lang.rkt | 0 .../scribble-lib}/scribble/lp/lang/reader.rkt | 0 .../scribble-lib}/scribble/manual-prefix.tex | 0 .../scribble-lib}/scribble/manual-struct.rkt | 0 .../scribble-lib}/scribble/manual-style.tex | 0 .../scribble-lib}/scribble/manual.rkt | 0 .../scribble-lib}/scribble/manual/lang.rkt | 0 .../scribble/manual/lang/reader.rkt | 0 .../scribble/markdown-render.rkt | 0 .../scribble-lib}/scribble/pdf-render.rkt | 0 .../scribble/private/defaults.rkt | 0 .../scribble/private/indirect-renderer.rkt | 0 .../scribble-lib}/scribble/private/lp.rkt | 0 .../scribble/private/manual-bib.rkt | 0 .../scribble/private/manual-bind.rkt | 0 .../scribble/private/manual-class.rkt | 0 .../scribble/private/manual-code.rkt | 0 .../scribble/private/manual-ex.rkt | 0 .../scribble/private/manual-form.rkt | 0 .../scribble/private/manual-method.rkt | 0 .../scribble/private/manual-mod.rkt | 0 .../scribble/private/manual-proc.rkt | 0 .../scribble/private/manual-scheme.rkt | 30 ++++-- .../scribble/private/manual-sprop.rkt | 0 .../scribble/private/manual-style.rkt | 0 .../scribble/private/manual-tech.rkt | 0 .../scribble/private/manual-unit.rkt | 0 .../scribble/private/manual-utils.rkt | 0 .../scribble/private/manual-vars.rkt | 0 .../scribble/private/on-demand.rkt | 0 .../scribble/private/provide-structs.rkt | 0 .../scribble-lib}/scribble/private/qsloc.rkt | 0 .../scribble/private/render-utils.rkt | 0 .../scribble/private/run-pdflatex.rkt | 0 .../scribble/provide-doc-transform.rkt | 0 .../scribble-lib}/scribble/racket.css | 0 .../scribble-lib}/scribble/racket.rkt | 0 .../scribble-lib}/scribble/racket.tex | 0 .../scribble-lib}/scribble/render-struct.rkt | 0 .../scribble-lib}/scribble/render.rkt | 0 .../scribble-lib}/scribble/report/lang.rkt | 0 .../scribble/report/lang/reader.rkt | 0 .../scribble-lib}/scribble/run.rkt | 0 .../scribble-lib}/scribble/scheme.rkt | 0 .../scribble-lib}/scribble/scribble-common.js | 0 .../scribble/scribble-prefix.html | 0 .../scribble/scribble-prefix.tex | 0 .../scribble-lib}/scribble/scribble-skull.tex | 0 .../scribble-lib}/scribble/scribble-style.css | 0 .../scribble-lib}/scribble/scribble-style.tex | 0 .../scribble-lib}/scribble/scribble.css | 0 .../scribble-lib}/scribble/scribble.tex | 0 .../scribble-lib}/scribble/search.rkt | 0 .../scribble-lib}/scribble/sigplan.rkt | 0 .../scribble-lib}/scribble/sigplan/lang.rkt | 0 .../scribble/sigplan/lang/reader.rkt | 0 .../scribble/sigplan/sigplan.css | 0 .../scribble/sigplan/sigplan.tex | 0 .../scribble/sigplan/sigplanconf.cls | 0 .../scribble-lib}/scribble/sigplan/style.tex | 0 .../scribble-lib}/scribble/srcdoc.rkt | 0 .../scribble-lib}/scribble/struct.rkt | 0 .../scribble-lib}/scribble/tag.rkt | 0 .../scribble-lib}/scribble/text-render.rkt | 0 .../scribble-lib}/scribble/text.rkt | 0 .../scribble-lib}/scribble/text/lang.rkt | 0 .../scribble/text/lang/reader.rkt | 0 .../scribble-lib}/scribble/text/main.rkt | 0 .../scribble-lib}/scribble/text/output.rkt | 0 .../scribble/text/syntax-utils.rkt | 2 +- .../scribble-lib}/scribble/text/wrap.rkt | 0 .../scribble-lib}/scribble/urls.rkt | 0 .../scribble-lib}/scribble/xref.rkt | 0 pkgs/scribble-pkgs/scribble/info.rkt | 4 + .../unstable-parameter-group-lib}/info.rkt | 1 - .../lib/collects}/help/help.rkt | 0 racket/lib/collects/help/info.rkt | 3 + .../lib/collects}/help/search.rkt | 0 .../help/tests/test-docs-complete.rkt | 0 277 files changed, 193 insertions(+), 69 deletions(-) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/autobib.css (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/autobib.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/autobib.tex (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/bibtex.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/figure.css (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/figure.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/figure.tex (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/footnote.css (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/footnote.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/footnote.tex (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/gui-eval.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/info.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/private/counter.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/private/gui-eval-exn.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/render-cond.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/autobib.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/bibtex.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/figure.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/footnote.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/gui-eval.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/info.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/render-cond.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-doc}/scriblib/scribblings/scriblib.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/decode.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-broken.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-broken.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation-corner.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation-corner.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation-more.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation-more.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-disambiguation.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-numbered.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-numbered.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-order.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib-order.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/autobib.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/codeblock-quote.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/codeblock-quote.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/codeblock-utf8.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/codeblock-utf8.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/cond.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/cond.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/decode.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/decode.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/diamond.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/diamond.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/diamond.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/empty-onthispage.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/empty-onthispage.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/eval-false.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/eval-false.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/eval-special.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/eval-special.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/figure.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/figure.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/filebox.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/filebox.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/footnote.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/footnote.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/grouper-sub.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/grouper-sub.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/grouper.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/grouper.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/itemlist.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/itemlist.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/manual-ex.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/manual.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/manual.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/print-lines.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/print-lines.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/read-alts.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/read-alts.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/stxobj.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/stxobj.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/tech.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/tech.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/text.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/text.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/wrap.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/docs/wrap.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/main.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/markdown-docs/example.md (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/markdown-docs/example.scrbl (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/markdown.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/reader.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/render.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/text-collect.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/text-lang.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/text-wrap.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scribble/xref.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scriblib/bibtex.normal.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scriblib/bibtex.number.txt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scriblib/bibtex.rkt (100%) rename {collects => pkgs/racket-pkgs/racket-test}/tests/scriblib/example.bib (100%) create mode 100644 pkgs/scribble-pkgs/scribble-doc/info.rkt rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/base.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/basic.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/bnf.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/book.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/class-diagrams.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/compat.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/config.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/core.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/decode.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/doclang.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/docreader.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/eval.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/generic.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/getting-started.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/how-to-paper.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/how-to.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/inbox.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/inbox.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/info.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/internals.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/jfp.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/layers.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lncs.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lp-ex-doc.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lp-ex.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lp.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lp.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/lp.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/manual-stub.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/manual.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/plt.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/reader-internals.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/reader.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/renderer.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/report.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/running.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/scheme.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/scribble.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/shaded.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/shaded.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/sigplan.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/srcdoc.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/struct-hierarchy.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/struct.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/style.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/tag.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/text.scrbl (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/utils.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-doc}/scribblings/scribble/xref.scrbl (100%) create mode 100644 pkgs/scribble-pkgs/scribble-lib/info.rkt rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/base-render.rkt (89%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/base.rkt (97%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/base/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/base/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/basic.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/bnf.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/book/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/book/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/book/style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/comment-reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/config.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/contract-render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/core.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/decode-struct.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/decode.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doc.txt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doc/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doc/main.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doc/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doclang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/doclang2.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/eval.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/extract.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html-properties.rkt (92%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html-render.rkt (96%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/html.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/main.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/resource.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/html/xml.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/info.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/.gitignore (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/jfp.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/jfp.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/jfp/style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/latex-prefix.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/latex-properties.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/latex-render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lncs/.gitignore (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lncs/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lncs/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lncs/lncs.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lncs/style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lp-include.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lp.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lp/lang/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/lp/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual-prefix.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual-struct.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual-style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/manual/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/markdown-render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/pdf-render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/defaults.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/indirect-renderer.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/lp.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-bib.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-bind.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-class.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-code.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-ex.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-form.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-method.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-mod.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-proc.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-scheme.rkt (90%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-sprop.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-style.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-tech.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-unit.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-utils.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/manual-vars.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/on-demand.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/provide-structs.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/qsloc.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/render-utils.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/private/run-pdflatex.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/provide-doc-transform.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/racket.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/racket.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/racket.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/render-struct.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/report/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/report/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/run.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scheme.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-common.js (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-prefix.html (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-prefix.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-skull.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-style.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble-style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/scribble.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/search.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/sigplan.css (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/sigplan.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/sigplanconf.cls (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/sigplan/style.tex (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/srcdoc.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/struct.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/tag.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text-render.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/lang.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/lang/reader.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/main.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/output.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/syntax-utils.rkt (99%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/text/wrap.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/urls.rkt (100%) rename {collects => pkgs/scribble-pkgs/scribble-lib}/scribble/xref.rkt (100%) create mode 100644 pkgs/scribble-pkgs/scribble/info.rkt rename {collects/tests/pkg/test-pkgs/pkg-z => pkgs/unstable-parameter-group-lib}/info.rkt (95%) rename {collects => racket/lib/collects}/help/help.rkt (100%) create mode 100644 racket/lib/collects/help/info.rkt rename {collects => racket/lib/collects}/help/search.rkt (100%) rename {collects => racket/lib/collects}/help/tests/test-docs-complete.rkt (100%) diff --git a/collects/scriblib/autobib.css b/pkgs/racket-pkgs/racket-doc/scriblib/autobib.css similarity index 100% rename from collects/scriblib/autobib.css rename to pkgs/racket-pkgs/racket-doc/scriblib/autobib.css diff --git a/collects/scriblib/autobib.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/autobib.rkt similarity index 100% rename from collects/scriblib/autobib.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/autobib.rkt diff --git a/collects/scriblib/autobib.tex b/pkgs/racket-pkgs/racket-doc/scriblib/autobib.tex similarity index 100% rename from collects/scriblib/autobib.tex rename to pkgs/racket-pkgs/racket-doc/scriblib/autobib.tex diff --git a/collects/scriblib/bibtex.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/bibtex.rkt similarity index 100% rename from collects/scriblib/bibtex.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/bibtex.rkt diff --git a/collects/scriblib/figure.css b/pkgs/racket-pkgs/racket-doc/scriblib/figure.css similarity index 100% rename from collects/scriblib/figure.css rename to pkgs/racket-pkgs/racket-doc/scriblib/figure.css diff --git a/collects/scriblib/figure.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/figure.rkt similarity index 100% rename from collects/scriblib/figure.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/figure.rkt diff --git a/collects/scriblib/figure.tex b/pkgs/racket-pkgs/racket-doc/scriblib/figure.tex similarity index 100% rename from collects/scriblib/figure.tex rename to pkgs/racket-pkgs/racket-doc/scriblib/figure.tex diff --git a/collects/scriblib/footnote.css b/pkgs/racket-pkgs/racket-doc/scriblib/footnote.css similarity index 100% rename from collects/scriblib/footnote.css rename to pkgs/racket-pkgs/racket-doc/scriblib/footnote.css diff --git a/collects/scriblib/footnote.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/footnote.rkt similarity index 100% rename from collects/scriblib/footnote.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/footnote.rkt diff --git a/collects/scriblib/footnote.tex b/pkgs/racket-pkgs/racket-doc/scriblib/footnote.tex similarity index 100% rename from collects/scriblib/footnote.tex rename to pkgs/racket-pkgs/racket-doc/scriblib/footnote.tex diff --git a/collects/scriblib/gui-eval.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/gui-eval.rkt similarity index 100% rename from collects/scriblib/gui-eval.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/gui-eval.rkt diff --git a/collects/scriblib/info.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/info.rkt similarity index 100% rename from collects/scriblib/info.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/info.rkt diff --git a/collects/scriblib/private/counter.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/private/counter.rkt similarity index 100% rename from collects/scriblib/private/counter.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/private/counter.rkt diff --git a/collects/scriblib/private/gui-eval-exn.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/private/gui-eval-exn.rkt similarity index 100% rename from collects/scriblib/private/gui-eval-exn.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/private/gui-eval-exn.rkt diff --git a/collects/scriblib/render-cond.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/render-cond.rkt similarity index 100% rename from collects/scriblib/render-cond.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/render-cond.rkt diff --git a/collects/scriblib/scribblings/autobib.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/autobib.scrbl similarity index 100% rename from collects/scriblib/scribblings/autobib.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/autobib.scrbl diff --git a/collects/scriblib/scribblings/bibtex.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/bibtex.scrbl similarity index 100% rename from collects/scriblib/scribblings/bibtex.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/bibtex.scrbl diff --git a/collects/scriblib/scribblings/figure.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/figure.scrbl similarity index 100% rename from collects/scriblib/scribblings/figure.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/figure.scrbl diff --git a/collects/scriblib/scribblings/footnote.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/footnote.scrbl similarity index 100% rename from collects/scriblib/scribblings/footnote.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/footnote.scrbl diff --git a/collects/scriblib/scribblings/gui-eval.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/gui-eval.scrbl similarity index 100% rename from collects/scriblib/scribblings/gui-eval.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/gui-eval.scrbl diff --git a/collects/scriblib/scribblings/info.rkt b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/info.rkt similarity index 100% rename from collects/scriblib/scribblings/info.rkt rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/info.rkt diff --git a/collects/scriblib/scribblings/render-cond.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/render-cond.scrbl similarity index 100% rename from collects/scriblib/scribblings/render-cond.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/render-cond.scrbl diff --git a/collects/scriblib/scribblings/scriblib.scrbl b/pkgs/racket-pkgs/racket-doc/scriblib/scribblings/scriblib.scrbl similarity index 100% rename from collects/scriblib/scribblings/scriblib.scrbl rename to pkgs/racket-pkgs/racket-doc/scriblib/scribblings/scriblib.scrbl diff --git a/collects/tests/scribble/decode.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/decode.rkt similarity index 100% rename from collects/tests/scribble/decode.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/decode.rkt diff --git a/collects/tests/scribble/docs.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs.rkt similarity index 100% rename from collects/tests/scribble/docs.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs.rkt diff --git a/collects/tests/scribble/docs/autobib-broken.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-broken.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-broken.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-broken.scrbl diff --git a/collects/tests/scribble/docs/autobib-broken.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-broken.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-broken.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-broken.txt diff --git a/collects/tests/scribble/docs/autobib-disambiguation-corner.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation-corner.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-corner.scrbl diff --git a/collects/tests/scribble/docs/autobib-disambiguation-corner.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-corner.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation-corner.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-corner.txt diff --git a/collects/tests/scribble/docs/autobib-disambiguation-more.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-more.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation-more.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-more.scrbl diff --git a/collects/tests/scribble/docs/autobib-disambiguation-more.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-more.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation-more.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation-more.txt diff --git a/collects/tests/scribble/docs/autobib-disambiguation.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation.scrbl diff --git a/collects/tests/scribble/docs/autobib-disambiguation.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-disambiguation.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-disambiguation.txt diff --git a/collects/tests/scribble/docs/autobib-numbered.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-numbered.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-numbered.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-numbered.scrbl diff --git a/collects/tests/scribble/docs/autobib-numbered.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-numbered.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-numbered.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-numbered.txt diff --git a/collects/tests/scribble/docs/autobib-order.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-order.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib-order.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-order.scrbl diff --git a/collects/tests/scribble/docs/autobib-order.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-order.txt similarity index 100% rename from collects/tests/scribble/docs/autobib-order.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib-order.txt diff --git a/collects/tests/scribble/docs/autobib.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib.scrbl similarity index 100% rename from collects/tests/scribble/docs/autobib.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib.scrbl diff --git a/collects/tests/scribble/docs/autobib.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib.txt similarity index 100% rename from collects/tests/scribble/docs/autobib.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/autobib.txt diff --git a/collects/tests/scribble/docs/codeblock-quote.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-quote.scrbl similarity index 100% rename from collects/tests/scribble/docs/codeblock-quote.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-quote.scrbl diff --git a/collects/tests/scribble/docs/codeblock-quote.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-quote.txt similarity index 100% rename from collects/tests/scribble/docs/codeblock-quote.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-quote.txt diff --git a/collects/tests/scribble/docs/codeblock-utf8.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-utf8.scrbl similarity index 100% rename from collects/tests/scribble/docs/codeblock-utf8.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-utf8.scrbl diff --git a/collects/tests/scribble/docs/codeblock-utf8.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-utf8.txt similarity index 100% rename from collects/tests/scribble/docs/codeblock-utf8.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/codeblock-utf8.txt diff --git a/collects/tests/scribble/docs/cond.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/cond.scrbl similarity index 100% rename from collects/tests/scribble/docs/cond.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/cond.scrbl diff --git a/collects/tests/scribble/docs/cond.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/cond.txt similarity index 100% rename from collects/tests/scribble/docs/cond.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/cond.txt diff --git a/collects/tests/scribble/docs/decode.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/decode.scrbl similarity index 100% rename from collects/tests/scribble/docs/decode.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/decode.scrbl diff --git a/collects/tests/scribble/docs/decode.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/decode.txt similarity index 100% rename from collects/tests/scribble/docs/decode.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/decode.txt diff --git a/collects/tests/scribble/docs/diamond.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.rkt similarity index 100% rename from collects/tests/scribble/docs/diamond.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.rkt diff --git a/collects/tests/scribble/docs/diamond.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.scrbl similarity index 100% rename from collects/tests/scribble/docs/diamond.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.scrbl diff --git a/collects/tests/scribble/docs/diamond.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.txt similarity index 100% rename from collects/tests/scribble/docs/diamond.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/diamond.txt diff --git a/collects/tests/scribble/docs/empty-onthispage.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/empty-onthispage.scrbl similarity index 100% rename from collects/tests/scribble/docs/empty-onthispage.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/empty-onthispage.scrbl diff --git a/collects/tests/scribble/docs/empty-onthispage.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/empty-onthispage.txt similarity index 100% rename from collects/tests/scribble/docs/empty-onthispage.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/empty-onthispage.txt diff --git a/collects/tests/scribble/docs/eval-false.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-false.scrbl similarity index 100% rename from collects/tests/scribble/docs/eval-false.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-false.scrbl diff --git a/collects/tests/scribble/docs/eval-false.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-false.txt similarity index 100% rename from collects/tests/scribble/docs/eval-false.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-false.txt diff --git a/collects/tests/scribble/docs/eval-special.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-special.scrbl similarity index 100% rename from collects/tests/scribble/docs/eval-special.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-special.scrbl diff --git a/collects/tests/scribble/docs/eval-special.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-special.txt similarity index 100% rename from collects/tests/scribble/docs/eval-special.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/eval-special.txt diff --git a/collects/tests/scribble/docs/figure.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/figure.scrbl similarity index 100% rename from collects/tests/scribble/docs/figure.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/figure.scrbl diff --git a/collects/tests/scribble/docs/figure.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/figure.txt similarity index 100% rename from collects/tests/scribble/docs/figure.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/figure.txt diff --git a/collects/tests/scribble/docs/filebox.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/filebox.scrbl similarity index 100% rename from collects/tests/scribble/docs/filebox.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/filebox.scrbl diff --git a/collects/tests/scribble/docs/filebox.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/filebox.txt similarity index 100% rename from collects/tests/scribble/docs/filebox.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/filebox.txt diff --git a/collects/tests/scribble/docs/footnote.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/footnote.scrbl similarity index 100% rename from collects/tests/scribble/docs/footnote.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/footnote.scrbl diff --git a/collects/tests/scribble/docs/footnote.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/footnote.txt similarity index 100% rename from collects/tests/scribble/docs/footnote.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/footnote.txt diff --git a/collects/tests/scribble/docs/grouper-sub.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper-sub.scrbl similarity index 100% rename from collects/tests/scribble/docs/grouper-sub.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper-sub.scrbl diff --git a/collects/tests/scribble/docs/grouper-sub.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper-sub.txt similarity index 100% rename from collects/tests/scribble/docs/grouper-sub.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper-sub.txt diff --git a/collects/tests/scribble/docs/grouper.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper.scrbl similarity index 100% rename from collects/tests/scribble/docs/grouper.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper.scrbl diff --git a/collects/tests/scribble/docs/grouper.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper.txt similarity index 100% rename from collects/tests/scribble/docs/grouper.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/grouper.txt diff --git a/collects/tests/scribble/docs/itemlist.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/itemlist.scrbl similarity index 100% rename from collects/tests/scribble/docs/itemlist.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/itemlist.scrbl diff --git a/collects/tests/scribble/docs/itemlist.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/itemlist.txt similarity index 100% rename from collects/tests/scribble/docs/itemlist.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/itemlist.txt diff --git a/collects/tests/scribble/docs/manual-ex.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual-ex.rkt similarity index 100% rename from collects/tests/scribble/docs/manual-ex.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual-ex.rkt diff --git a/collects/tests/scribble/docs/manual.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual.scrbl similarity index 100% rename from collects/tests/scribble/docs/manual.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual.scrbl diff --git a/collects/tests/scribble/docs/manual.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual.txt similarity index 100% rename from collects/tests/scribble/docs/manual.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/manual.txt diff --git a/collects/tests/scribble/docs/print-lines.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/print-lines.scrbl similarity index 100% rename from collects/tests/scribble/docs/print-lines.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/print-lines.scrbl diff --git a/collects/tests/scribble/docs/print-lines.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/print-lines.txt similarity index 100% rename from collects/tests/scribble/docs/print-lines.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/print-lines.txt diff --git a/collects/tests/scribble/docs/read-alts.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/read-alts.scrbl similarity index 100% rename from collects/tests/scribble/docs/read-alts.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/read-alts.scrbl diff --git a/collects/tests/scribble/docs/read-alts.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/read-alts.txt similarity index 100% rename from collects/tests/scribble/docs/read-alts.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/read-alts.txt diff --git a/collects/tests/scribble/docs/stxobj.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/stxobj.scrbl similarity index 100% rename from collects/tests/scribble/docs/stxobj.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/stxobj.scrbl diff --git a/collects/tests/scribble/docs/stxobj.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/stxobj.txt similarity index 100% rename from collects/tests/scribble/docs/stxobj.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/stxobj.txt diff --git a/collects/tests/scribble/docs/tech.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/tech.scrbl similarity index 100% rename from collects/tests/scribble/docs/tech.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/tech.scrbl diff --git a/collects/tests/scribble/docs/tech.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/tech.txt similarity index 100% rename from collects/tests/scribble/docs/tech.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/tech.txt diff --git a/collects/tests/scribble/docs/text.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/text.scrbl similarity index 100% rename from collects/tests/scribble/docs/text.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/text.scrbl diff --git a/collects/tests/scribble/docs/text.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/text.txt similarity index 100% rename from collects/tests/scribble/docs/text.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/text.txt diff --git a/collects/tests/scribble/docs/wrap.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/wrap.scrbl similarity index 100% rename from collects/tests/scribble/docs/wrap.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/wrap.scrbl diff --git a/collects/tests/scribble/docs/wrap.txt b/pkgs/racket-pkgs/racket-test/tests/scribble/docs/wrap.txt similarity index 100% rename from collects/tests/scribble/docs/wrap.txt rename to pkgs/racket-pkgs/racket-test/tests/scribble/docs/wrap.txt diff --git a/collects/tests/scribble/main.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/main.rkt similarity index 100% rename from collects/tests/scribble/main.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/main.rkt diff --git a/collects/tests/scribble/markdown-docs/example.md b/pkgs/racket-pkgs/racket-test/tests/scribble/markdown-docs/example.md similarity index 100% rename from collects/tests/scribble/markdown-docs/example.md rename to pkgs/racket-pkgs/racket-test/tests/scribble/markdown-docs/example.md diff --git a/collects/tests/scribble/markdown-docs/example.scrbl b/pkgs/racket-pkgs/racket-test/tests/scribble/markdown-docs/example.scrbl similarity index 100% rename from collects/tests/scribble/markdown-docs/example.scrbl rename to pkgs/racket-pkgs/racket-test/tests/scribble/markdown-docs/example.scrbl diff --git a/collects/tests/scribble/markdown.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/markdown.rkt similarity index 100% rename from collects/tests/scribble/markdown.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/markdown.rkt diff --git a/collects/tests/scribble/reader.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/reader.rkt similarity index 100% rename from collects/tests/scribble/reader.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/reader.rkt diff --git a/collects/tests/scribble/render.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/render.rkt similarity index 100% rename from collects/tests/scribble/render.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/render.rkt diff --git a/collects/tests/scribble/text-collect.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/text-collect.rkt similarity index 100% rename from collects/tests/scribble/text-collect.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/text-collect.rkt diff --git a/collects/tests/scribble/text-lang.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/text-lang.rkt similarity index 100% rename from collects/tests/scribble/text-lang.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/text-lang.rkt diff --git a/collects/tests/scribble/text-wrap.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/text-wrap.rkt similarity index 100% rename from collects/tests/scribble/text-wrap.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/text-wrap.rkt diff --git a/collects/tests/scribble/xref.rkt b/pkgs/racket-pkgs/racket-test/tests/scribble/xref.rkt similarity index 100% rename from collects/tests/scribble/xref.rkt rename to pkgs/racket-pkgs/racket-test/tests/scribble/xref.rkt diff --git a/collects/tests/scriblib/bibtex.normal.txt b/pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.normal.txt similarity index 100% rename from collects/tests/scriblib/bibtex.normal.txt rename to pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.normal.txt diff --git a/collects/tests/scriblib/bibtex.number.txt b/pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.number.txt similarity index 100% rename from collects/tests/scriblib/bibtex.number.txt rename to pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.number.txt diff --git a/collects/tests/scriblib/bibtex.rkt b/pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.rkt similarity index 100% rename from collects/tests/scriblib/bibtex.rkt rename to pkgs/racket-pkgs/racket-test/tests/scriblib/bibtex.rkt diff --git a/collects/tests/scriblib/example.bib b/pkgs/racket-pkgs/racket-test/tests/scriblib/example.bib similarity index 100% rename from collects/tests/scriblib/example.bib rename to pkgs/racket-pkgs/racket-test/tests/scriblib/example.bib diff --git a/pkgs/scribble-pkgs/scribble-doc/info.rkt b/pkgs/scribble-pkgs/scribble-doc/info.rkt new file mode 100644 index 00000000..fcefafb1 --- /dev/null +++ b/pkgs/scribble-pkgs/scribble-doc/info.rkt @@ -0,0 +1,4 @@ +#lang setup/infotab + +(define build-deps '("scribble-lib" + "racket-doc")) diff --git a/collects/scribblings/scribble/base.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl similarity index 100% rename from collects/scribblings/scribble/base.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/base.scrbl diff --git a/collects/scribblings/scribble/basic.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl similarity index 100% rename from collects/scribblings/scribble/basic.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/basic.scrbl diff --git a/collects/scribblings/scribble/bnf.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl similarity index 100% rename from collects/scribblings/scribble/bnf.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/bnf.scrbl diff --git a/collects/scribblings/scribble/book.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl similarity index 100% rename from collects/scribblings/scribble/book.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/book.scrbl diff --git a/collects/scribblings/scribble/class-diagrams.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt similarity index 100% rename from collects/scribblings/scribble/class-diagrams.rkt rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/class-diagrams.rkt diff --git a/collects/scribblings/scribble/compat.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl similarity index 100% rename from collects/scribblings/scribble/compat.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/compat.scrbl diff --git a/collects/scribblings/scribble/config.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl similarity index 100% rename from collects/scribblings/scribble/config.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/config.scrbl diff --git a/collects/scribblings/scribble/core.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl similarity index 100% rename from collects/scribblings/scribble/core.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/core.scrbl diff --git a/collects/scribblings/scribble/decode.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl similarity index 100% rename from collects/scribblings/scribble/decode.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/decode.scrbl diff --git a/collects/scribblings/scribble/doclang.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl similarity index 100% rename from collects/scribblings/scribble/doclang.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/doclang.scrbl diff --git a/collects/scribblings/scribble/docreader.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl similarity index 100% rename from collects/scribblings/scribble/docreader.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/docreader.scrbl diff --git a/collects/scribblings/scribble/eval.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl similarity index 100% rename from collects/scribblings/scribble/eval.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/eval.scrbl diff --git a/collects/scribblings/scribble/generic.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl similarity index 100% rename from collects/scribblings/scribble/generic.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/generic.scrbl diff --git a/collects/scribblings/scribble/getting-started.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl similarity index 100% rename from collects/scribblings/scribble/getting-started.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl diff --git a/collects/scribblings/scribble/how-to-paper.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl similarity index 100% rename from collects/scribblings/scribble/how-to-paper.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl diff --git a/collects/scribblings/scribble/how-to.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl similarity index 100% rename from collects/scribblings/scribble/how-to.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/how-to.scrbl diff --git a/collects/scribblings/scribble/inbox.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css similarity index 100% rename from collects/scribblings/scribble/inbox.css rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.css diff --git a/collects/scribblings/scribble/inbox.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex similarity index 100% rename from collects/scribblings/scribble/inbox.tex rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/inbox.tex diff --git a/collects/scribblings/scribble/info.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt similarity index 100% rename from collects/scribblings/scribble/info.rkt rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/info.rkt diff --git a/collects/scribblings/scribble/internals.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl similarity index 100% rename from collects/scribblings/scribble/internals.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/internals.scrbl diff --git a/collects/scribblings/scribble/jfp.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl similarity index 100% rename from collects/scribblings/scribble/jfp.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/jfp.scrbl diff --git a/collects/scribblings/scribble/layers.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl similarity index 100% rename from collects/scribblings/scribble/layers.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/layers.scrbl diff --git a/collects/scribblings/scribble/lncs.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl similarity index 100% rename from collects/scribblings/scribble/lncs.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lncs.scrbl diff --git a/collects/scribblings/scribble/lp-ex-doc.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl similarity index 100% rename from collects/scribblings/scribble/lp-ex-doc.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex-doc.scrbl diff --git a/collects/scribblings/scribble/lp-ex.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt similarity index 100% rename from collects/scribblings/scribble/lp-ex.rkt rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp-ex.rkt diff --git a/collects/scribblings/scribble/lp.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css similarity index 100% rename from collects/scribblings/scribble/lp.css rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.css diff --git a/collects/scribblings/scribble/lp.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl similarity index 100% rename from collects/scribblings/scribble/lp.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.scrbl diff --git a/collects/scribblings/scribble/lp.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex similarity index 100% rename from collects/scribblings/scribble/lp.tex rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/lp.tex diff --git a/collects/scribblings/scribble/manual-stub.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl similarity index 100% rename from collects/scribblings/scribble/manual-stub.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual-stub.scrbl diff --git a/collects/scribblings/scribble/manual.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl similarity index 100% rename from collects/scribblings/scribble/manual.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/manual.scrbl diff --git a/collects/scribblings/scribble/plt.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl similarity index 100% rename from collects/scribblings/scribble/plt.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/plt.scrbl diff --git a/collects/scribblings/scribble/reader-internals.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl similarity index 100% rename from collects/scribblings/scribble/reader-internals.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader-internals.scrbl diff --git a/collects/scribblings/scribble/reader.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl similarity index 100% rename from collects/scribblings/scribble/reader.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/reader.scrbl diff --git a/collects/scribblings/scribble/renderer.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl similarity index 100% rename from collects/scribblings/scribble/renderer.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/renderer.scrbl diff --git a/collects/scribblings/scribble/report.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl similarity index 100% rename from collects/scribblings/scribble/report.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/report.scrbl diff --git a/collects/scribblings/scribble/running.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl similarity index 100% rename from collects/scribblings/scribble/running.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/running.scrbl diff --git a/collects/scribblings/scribble/scheme.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl similarity index 100% rename from collects/scribblings/scribble/scheme.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scheme.scrbl diff --git a/collects/scribblings/scribble/scribble.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl similarity index 100% rename from collects/scribblings/scribble/scribble.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/scribble.scrbl diff --git a/collects/scribblings/scribble/shaded.css b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css similarity index 100% rename from collects/scribblings/scribble/shaded.css rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.css diff --git a/collects/scribblings/scribble/shaded.tex b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex similarity index 100% rename from collects/scribblings/scribble/shaded.tex rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/shaded.tex diff --git a/collects/scribblings/scribble/sigplan.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl similarity index 100% rename from collects/scribblings/scribble/sigplan.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/sigplan.scrbl diff --git a/collects/scribblings/scribble/srcdoc.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl similarity index 100% rename from collects/scribblings/scribble/srcdoc.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/srcdoc.scrbl diff --git a/collects/scribblings/scribble/struct-hierarchy.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt similarity index 100% rename from collects/scribblings/scribble/struct-hierarchy.rkt rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct-hierarchy.rkt diff --git a/collects/scribblings/scribble/struct.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl similarity index 100% rename from collects/scribblings/scribble/struct.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/struct.scrbl diff --git a/collects/scribblings/scribble/style.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl similarity index 100% rename from collects/scribblings/scribble/style.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/style.scrbl diff --git a/collects/scribblings/scribble/tag.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl similarity index 100% rename from collects/scribblings/scribble/tag.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/tag.scrbl diff --git a/collects/scribblings/scribble/text.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl similarity index 100% rename from collects/scribblings/scribble/text.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/text.scrbl diff --git a/collects/scribblings/scribble/utils.rkt b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt similarity index 100% rename from collects/scribblings/scribble/utils.rkt rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/utils.rkt diff --git a/collects/scribblings/scribble/xref.scrbl b/pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl similarity index 100% rename from collects/scribblings/scribble/xref.scrbl rename to pkgs/scribble-pkgs/scribble-doc/scribblings/scribble/xref.scrbl diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/info.rkt new file mode 100644 index 00000000..5fc09c24 --- /dev/null +++ b/pkgs/scribble-pkgs/scribble-lib/info.rkt @@ -0,0 +1,5 @@ +#lang setup/infotab + +(define deps '("at-exp-lib" + "draw-lib" + "syntax-color-lib")) diff --git a/collects/scribble/base-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt similarity index 89% rename from collects/scribble/base-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt index c7102207..c28fc180 100644 --- a/collects/scribble/base-render.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/base-render.rkt @@ -912,44 +912,78 @@ ""))))))))]) (let-values ([(dest-file normalized-dest-file) (let loop ([dest-file dest-file]) - (let ([normalized-dest-file - (normal-case-path (simplify-path (path->complete-path dest-file)))] - [check-same - (lambda (src) - (call-with-input-file* - dest-file - (lambda (dest) - (or (and (not content) - (equal? (port-file-identity src) - (port-file-identity dest))) - (let loop () - (let ([s (read-bytes 4096 src)] - [d (read-bytes 4096 dest)]) - (and (equal? s d) - (or (eof-object? s) (loop)))))))))]) - (if (file-exists? dest-file) - (cond - [(or (and content - (check-same (open-input-bytes content))) - (and (not content) - (call-with-input-file* src-file check-same))) - ;; same content at that destination - (values dest-file normalized-dest-file)] - [(hash-ref copied-dests normalized-dest-file #f) - ;; need a different file - (loop (next-file-name dest-file))] - [else - ;; replace the file - (delete-file dest-file) - (values dest-file normalized-dest-file)]) - ;; new file - (values dest-file normalized-dest-file))))]) - (unless (file-exists? dest-file) + (let* ([normalized-dest-file + (normal-case-path (simplify-path (path->complete-path dest-file)))] + [check-same + (lambda (src dest-file) + (call-with-input-file* + dest-file + (lambda (dest) + (or (and (not content) + (equal? (port-file-identity src) + (port-file-identity dest))) + (let loop () + (let ([s (read-bytes 4096 src)] + [d (read-bytes 4096 dest)]) + (and (equal? s d) + (or (eof-object? s) (loop)))))))))] + [same-directories? + (lambda (s d) + (let loop ([s s] [d d]) + (cond + [(and (file-exists? s) (file-exists? d)) + (call-with-input-file* s (lambda (in) + (check-same in d)))] + [(directory-exists? s) + (and (directory-exists? d) + (let ([sl (sort (directory-list s) bytesbytes)] + [dl (sort (directory-list d) bytesbytes)]) + (and (equal? sl dl) + (andmap loop sl dl))))] + [else #f])))] + [not-same + (lambda (delete-dest) + (cond + [(hash-ref copied-dests normalized-dest-file #f) + ;; need a different file/directory + (loop (next-file-name dest-file))] + [else + ;; replace the file/directory + (delete-dest dest-file) + (values dest-file normalized-dest-file)]))]) + (cond + [(and (file-exists? src-file) + (file-exists? dest-file)) + (cond + [(or (and content + (check-same (open-input-bytes content) dest-file)) + (and (not content) + (call-with-input-file* src-file (lambda (in) (check-same in dest-file))))) + ;; same content at that destination + (values dest-file normalized-dest-file)] + [else + (not-same delete-file)])] + [(and (directory-exists? src-file) + (directory-exists? dest-file)) + (if (same-directories? src-file dest-file) + (values dest-file normalized-dest-file) + (not-same delete-directory/files))] + [(file-exists? dest-file) + (not-same delete-file)] + [(directory-exists? dest-file) + (not-same delete-directory/files)] + [else + ;; new file/directory + (values dest-file normalized-dest-file)])))]) + (unless (or (file-exists? dest-file) + (directory-exists? dest-file)) (if content (call-with-output-file* dest-file (lambda (dest) (write-bytes content dest))) - (copy-file src-file dest-file))) + (if (directory-exists? src-file) + (copy-directory/files src-file dest-file) + (copy-file src-file dest-file)))) (hash-set! copied-dests normalized-dest-file #t) (let ([result (path->string (file-name-from-path dest-file))]) (unless content diff --git a/collects/scribble/base.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt similarity index 97% rename from collects/scribble/base.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt index bc764183..8715bc22 100644 --- a/collects/scribble/base.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/base.rkt @@ -424,7 +424,8 @@ [seclink (->* (string?) (#:doc module-path? #:tag-prefixes (or/c #f (listof string?)) - #:underline? any/c) + #:underline? any/c + #:indirect? any/c) #:rest (listof pre-content?) element?)] [other-doc (->* (module-path?) @@ -445,8 +446,23 @@ (element-content le) (link-element-tag le)))) -(define (seclink tag #:underline? [u? #t] #:doc [doc #f] #:tag-prefixes [prefix #f] . s) - (make-link-element (if u? #f "plainlink") (decode-content s) +(define normal-indirect (style #f '(indirect-link))) +(define plain-indirect (style "plainlink" '(indirect-link))) + +(define (seclink tag + #:doc [doc #f] + #:underline? [u? #t] + #:tag-prefixes [prefix #f] + #:indirect? [indirect? #f] + . s) + (make-link-element (if indirect? + (if u? + normal-indirect + plain-indirect) + (if u? + #f + "plainlink")) + (decode-content s) `(part ,(doc-prefix doc prefix tag)))) (define (other-doc #:underline? [u? #t] doc) diff --git a/collects/scribble/base/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt similarity index 100% rename from collects/scribble/base/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/base/lang.rkt diff --git a/collects/scribble/base/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt similarity index 100% rename from collects/scribble/base/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/base/lang/reader.rkt diff --git a/collects/scribble/basic.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt similarity index 100% rename from collects/scribble/basic.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/basic.rkt diff --git a/collects/scribble/bnf.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt similarity index 100% rename from collects/scribble/bnf.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/bnf.rkt diff --git a/collects/scribble/book/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt similarity index 100% rename from collects/scribble/book/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/book/lang.rkt diff --git a/collects/scribble/book/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt similarity index 100% rename from collects/scribble/book/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/book/lang/reader.rkt diff --git a/collects/scribble/book/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex similarity index 100% rename from collects/scribble/book/style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/book/style.tex diff --git a/collects/scribble/comment-reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt similarity index 100% rename from collects/scribble/comment-reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/comment-reader.rkt diff --git a/collects/scribble/config.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt similarity index 100% rename from collects/scribble/config.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/config.rkt diff --git a/collects/scribble/contract-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt similarity index 100% rename from collects/scribble/contract-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/contract-render.rkt diff --git a/collects/scribble/core.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt similarity index 100% rename from collects/scribble/core.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/core.rkt diff --git a/collects/scribble/decode-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt similarity index 100% rename from collects/scribble/decode-struct.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/decode-struct.rkt diff --git a/collects/scribble/decode.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt similarity index 100% rename from collects/scribble/decode.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/decode.rkt diff --git a/collects/scribble/doc.txt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt similarity index 100% rename from collects/scribble/doc.txt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doc.txt diff --git a/collects/scribble/doc/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt similarity index 100% rename from collects/scribble/doc/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doc/lang/reader.rkt diff --git a/collects/scribble/doc/main.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt similarity index 100% rename from collects/scribble/doc/main.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doc/main.rkt diff --git a/collects/scribble/doc/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt similarity index 100% rename from collects/scribble/doc/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doc/reader.rkt diff --git a/collects/scribble/doclang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt similarity index 100% rename from collects/scribble/doclang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doclang.rkt diff --git a/collects/scribble/doclang2.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt similarity index 100% rename from collects/scribble/doclang2.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/doclang2.rkt diff --git a/collects/scribble/eval.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt similarity index 100% rename from collects/scribble/eval.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/eval.rkt diff --git a/collects/scribble/extract.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt similarity index 100% rename from collects/scribble/extract.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/extract.rkt diff --git a/collects/scribble/html-properties.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt similarity index 92% rename from collects/scribble/html-properties.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt index b1f7d16e..642d388c 100644 --- a/collects/scribble/html-properties.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/html-properties.rkt @@ -20,4 +20,7 @@ [attributes ([assoc (listof (cons/c symbol? string?))])] [column-attributes ([assoc (listof (cons/c symbol? string?))])] + [part-link-redirect ([url url?])] + [install-resource ([path path-string?])] + [head-extra ([xexpr xexpr/c])]) diff --git a/collects/scribble/html-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt similarity index 96% rename from collects/scribble/html-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt index 3834734a..fb8c84b9 100644 --- a/collects/scribble/html-render.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt @@ -301,15 +301,24 @@ (part-whole-page? d ri)) (define/override (collect-part-tags d ci number) + (define redirect (let ([s (part-style d)]) + (and s + (for/or ([p (in-list (style-properties s))]) + (and (part-link-redirect? p) + (part-link-redirect-url p)))))) (for ([t (part-tags d)]) (let ([key (generate-tag t ci)]) (collect-put! ci key - (vector (or (part-title-content d) '("???")) - (add-current-tag-prefix key) - number ; for consistency with base - (and (current-output-file) - (path->relative (current-output-file))) - (current-part-whole-page? d)))))) + (let ([v (vector (or (part-title-content d) '("???")) + (add-current-tag-prefix key) + number ; for consistency with base + (and (current-output-file) + (path->relative (current-output-file))) + (current-part-whole-page? d))]) + (if redirect + (list->vector (append (vector->list v) + (list (url->string* redirect)))) + v)))))) (define/override (collect-target-element i ci) (let ([key (generate-tag (target-element-tag i) ci)]) @@ -340,6 +349,10 @@ (vector-ref dest 4)) (define (dest-anchor dest) (vector-ref dest 1)) + (define (dest-redirect dest) + (if ((vector-length dest) . > . 5) + (vector-ref dest 5) + #f)) ;; ---------------------------------------- @@ -406,6 +419,23 @@ tag (serialize tag))))) + (define/private (link-element-indirect? e) + (memq 'indirect-link + (let ([s (element-style e)]) + (or (and (style? s) + (style-properties s)) + null)))) + + (define/override (resolve-content i d ri) + (cond + [(and (link-element? i) + external-tag-path + (link-element-indirect? i)) + ;; don't resolve indirect link + (resolve-content (element-content i) d ri)] + [else + (super resolve-content i d ri)])) + ;; ---------------------------------------- (define/private (reveal-subparts? p) ;!!! need to use this @@ -416,18 +446,19 @@ (define/private (dest->url dest [abs? #f]) (if dest - (format "~a~a~a" - (let ([p (relative->path (dest-path dest))]) - (if abs? - (path->url-string (path->complete-path p)) - (if (equal? p (current-output-file)) - "" - (from-root p (get-dest-directory))))) - (if (dest-page? dest) "" "#") - (if (dest-page? dest) - "" - (uri-unreserved-encode - (anchor-name (dest-anchor dest))))) + (or (dest-redirect dest) + (format "~a~a~a" + (let ([p (relative->path (dest-path dest))]) + (if abs? + (path->url-string (path->complete-path p)) + (if (equal? p (current-output-file)) + "" + (from-root p (get-dest-directory))))) + (if (dest-page? dest) "" "#") + (if (dest-page? dest) + "" + (uri-unreserved-encode + (anchor-name (dest-anchor dest)))))) "???")) (define/public (render-toc-view d ri) @@ -1150,9 +1181,13 @@ ,@(render-content (element-content e) part ri))] [(and (link-element? e) (not (current-no-links))) (parameterize ([current-no-links #t]) + (define indirect-link? (link-element-indirect? e)) (let-values ([(dest ext?) - (resolve-get/ext? part ri (link-element-tag e))]) - (if dest + (if (and indirect-link? + external-tag-path) + (values #f #f) + (resolve-get/ext? part ri (link-element-tag e)))]) + (if (or indirect-link? dest) `((a [(href ,(cond [(and ext? external-root-url @@ -1177,7 +1212,8 @@ [fragment (and (not (dest-page? dest)) (anchor-name (dest-anchor dest)))])))] - [(and ext? external-tag-path) + [(or indirect-link? + (and ext? external-tag-path)) ;; Redirected to search: (url->string* (let ([u (string->url external-tag-path)]) @@ -1190,7 +1226,8 @@ [else ;; Normal link: (dest->url dest)])) - ,@(attribs (if (and ext? external-tag-path) + ,@(attribs (if (or indirect-link? + (and ext? external-tag-path)) '((class "Sq")) null)) [data-pltdoc "x"]] @@ -1222,6 +1259,9 @@ (let ([s (content-style e)]) (and (style? s) (style->tag s)))] + [resources (for/list ([p (in-list properties)] + #:when (install-resource? p)) + (install-resource-path p))] [link? (and (ormap target-url? properties) (not (current-no-links)))] [anchor? (ormap url-anchor? properties)] @@ -1246,6 +1286,8 @@ (lambda () (when (render-element? e) ((render-element-render e) this part ri)))]) + (for ([r (in-list resources)]) + (install-file r)) (let-values ([(content) (cond [link? (parameterize ([current-no-links #t]) diff --git a/collects/scribble/html.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html.rkt similarity index 100% rename from collects/scribble/html.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html.rkt diff --git a/collects/scribble/html/html.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/html.rkt similarity index 100% rename from collects/scribble/html/html.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/html.rkt diff --git a/collects/scribble/html/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/lang.rkt similarity index 100% rename from collects/scribble/html/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/lang.rkt diff --git a/collects/scribble/html/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/lang/reader.rkt similarity index 100% rename from collects/scribble/html/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/lang/reader.rkt diff --git a/collects/scribble/html/main.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/main.rkt similarity index 100% rename from collects/scribble/html/main.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/main.rkt diff --git a/collects/scribble/html/resource.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/resource.rkt similarity index 100% rename from collects/scribble/html/resource.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/resource.rkt diff --git a/collects/scribble/html/xml.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html/xml.rkt similarity index 100% rename from collects/scribble/html/xml.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/html/xml.rkt diff --git a/collects/scribble/info.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt similarity index 100% rename from collects/scribble/info.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/info.rkt diff --git a/collects/scribble/jfp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt similarity index 100% rename from collects/scribble/jfp.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp.rkt diff --git a/collects/scribble/jfp/.gitignore b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore similarity index 100% rename from collects/scribble/jfp/.gitignore rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/.gitignore diff --git a/collects/scribble/jfp/jfp.css b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css similarity index 100% rename from collects/scribble/jfp/jfp.css rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.css diff --git a/collects/scribble/jfp/jfp.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex similarity index 100% rename from collects/scribble/jfp/jfp.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/jfp.tex diff --git a/collects/scribble/jfp/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt similarity index 100% rename from collects/scribble/jfp/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang.rkt diff --git a/collects/scribble/jfp/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt similarity index 100% rename from collects/scribble/jfp/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/lang/reader.rkt diff --git a/collects/scribble/jfp/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex similarity index 100% rename from collects/scribble/jfp/style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/jfp/style.tex diff --git a/collects/scribble/latex-prefix.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt similarity index 100% rename from collects/scribble/latex-prefix.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/latex-prefix.rkt diff --git a/collects/scribble/latex-properties.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt similarity index 100% rename from collects/scribble/latex-properties.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/latex-properties.rkt diff --git a/collects/scribble/latex-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt similarity index 100% rename from collects/scribble/latex-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/latex-render.rkt diff --git a/collects/scribble/lncs/.gitignore b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore similarity index 100% rename from collects/scribble/lncs/.gitignore rename to pkgs/scribble-pkgs/scribble-lib/scribble/lncs/.gitignore diff --git a/collects/scribble/lncs/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt similarity index 100% rename from collects/scribble/lncs/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang.rkt diff --git a/collects/scribble/lncs/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt similarity index 100% rename from collects/scribble/lncs/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lang/reader.rkt diff --git a/collects/scribble/lncs/lncs.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex similarity index 100% rename from collects/scribble/lncs/lncs.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/lncs/lncs.tex diff --git a/collects/scribble/lncs/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex similarity index 100% rename from collects/scribble/lncs/style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/lncs/style.tex diff --git a/collects/scribble/lp-include.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt similarity index 100% rename from collects/scribble/lp-include.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lp-include.rkt diff --git a/collects/scribble/lp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt similarity index 100% rename from collects/scribble/lp.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lp.rkt diff --git a/collects/scribble/lp/lang/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt similarity index 100% rename from collects/scribble/lp/lang/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/lang.rkt diff --git a/collects/scribble/lp/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt similarity index 100% rename from collects/scribble/lp/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/lp/lang/reader.rkt diff --git a/collects/scribble/manual-prefix.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex similarity index 100% rename from collects/scribble/manual-prefix.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual-prefix.tex diff --git a/collects/scribble/manual-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt similarity index 100% rename from collects/scribble/manual-struct.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual-struct.rkt diff --git a/collects/scribble/manual-style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex similarity index 100% rename from collects/scribble/manual-style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual-style.tex diff --git a/collects/scribble/manual.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt similarity index 100% rename from collects/scribble/manual.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual.rkt diff --git a/collects/scribble/manual/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt similarity index 100% rename from collects/scribble/manual/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang.rkt diff --git a/collects/scribble/manual/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt similarity index 100% rename from collects/scribble/manual/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/manual/lang/reader.rkt diff --git a/collects/scribble/markdown-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt similarity index 100% rename from collects/scribble/markdown-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/markdown-render.rkt diff --git a/collects/scribble/pdf-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt similarity index 100% rename from collects/scribble/pdf-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/pdf-render.rkt diff --git a/collects/scribble/private/defaults.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt similarity index 100% rename from collects/scribble/private/defaults.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/defaults.rkt diff --git a/collects/scribble/private/indirect-renderer.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt similarity index 100% rename from collects/scribble/private/indirect-renderer.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/indirect-renderer.rkt diff --git a/collects/scribble/private/lp.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt similarity index 100% rename from collects/scribble/private/lp.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/lp.rkt diff --git a/collects/scribble/private/manual-bib.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt similarity index 100% rename from collects/scribble/private/manual-bib.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bib.rkt diff --git a/collects/scribble/private/manual-bind.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt similarity index 100% rename from collects/scribble/private/manual-bind.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt diff --git a/collects/scribble/private/manual-class.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt similarity index 100% rename from collects/scribble/private/manual-class.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt diff --git a/collects/scribble/private/manual-code.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt similarity index 100% rename from collects/scribble/private/manual-code.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-code.rkt diff --git a/collects/scribble/private/manual-ex.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt similarity index 100% rename from collects/scribble/private/manual-ex.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-ex.rkt diff --git a/collects/scribble/private/manual-form.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt similarity index 100% rename from collects/scribble/private/manual-form.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-form.rkt diff --git a/collects/scribble/private/manual-method.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt similarity index 100% rename from collects/scribble/private/manual-method.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-method.rkt diff --git a/collects/scribble/private/manual-mod.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt similarity index 100% rename from collects/scribble/private/manual-mod.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-mod.rkt diff --git a/collects/scribble/private/manual-proc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt similarity index 100% rename from collects/scribble/private/manual-proc.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt diff --git a/collects/scribble/private/manual-scheme.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt similarity index 90% rename from collects/scribble/private/manual-scheme.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt index 20f28337..9406b3f6 100644 --- a/collects/scribble/private/manual-scheme.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-scheme.rkt @@ -4,6 +4,7 @@ "../scheme.rkt" "../search.rkt" "../basic.rkt" + (only-in "../core.rkt" style style-properties) "manual-style.rkt" "manual-utils.rkt" ;; used via datum->syntax (for-syntax racket/base) @@ -97,7 +98,8 @@ ,(if (identifier? #'lang) `(as-modname-link ',#'lang - (to-element ',#'lang)) + (to-element ',#'lang) + #f) #'(racket lang))))) #'lang)]) (if (syntax-e #'filename) @@ -190,22 +192,34 @@ (syntax-rules (unsyntax) [(racketmodname #,n) (let ([sym n]) - (as-modname-link sym (to-element sym)))] + (as-modname-link sym (to-element sym) #f))] [(racketmodname n) - (as-modname-link 'n (**racketmodname n))])) + (as-modname-link 'n (**racketmodname n) #f)] + [(racketmodname #,n #:indirect) + (let ([sym n]) + (as-modname-link sym (to-element sym) #t))] + [(racketmodname n #:indirect) + (as-modname-link 'n (**racketmodname n) #t)])) (define-syntax racketmodlink (syntax-rules (unsyntax) [(racketmodlink n content ...) - (*as-modname-link 'n (elem #:style #f content ...))])) + (*as-modname-link 'n (elem #:style #f content ...) #f)])) -(define (as-modname-link s e) +(define (as-modname-link s e indirect?) (if (symbol? s) - (*as-modname-link s e) + (*as-modname-link s e indirect?) e)) -(define (*as-modname-link s e) - (make-link-element module-link-color +(define indirect-module-link-color + (struct-copy style module-link-color + [properties (cons 'indirect-link + (style-properties module-link-color))])) + +(define (*as-modname-link s e indirect?) + (make-link-element (if indirect? + indirect-module-link-color + module-link-color) (list e) `(mod-path ,(datum-intern-literal (format "~s" s))))) diff --git a/collects/scribble/private/manual-sprop.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt similarity index 100% rename from collects/scribble/private/manual-sprop.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-sprop.rkt diff --git a/collects/scribble/private/manual-style.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt similarity index 100% rename from collects/scribble/private/manual-style.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-style.rkt diff --git a/collects/scribble/private/manual-tech.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt similarity index 100% rename from collects/scribble/private/manual-tech.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-tech.rkt diff --git a/collects/scribble/private/manual-unit.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt similarity index 100% rename from collects/scribble/private/manual-unit.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-unit.rkt diff --git a/collects/scribble/private/manual-utils.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt similarity index 100% rename from collects/scribble/private/manual-utils.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-utils.rkt diff --git a/collects/scribble/private/manual-vars.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt similarity index 100% rename from collects/scribble/private/manual-vars.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-vars.rkt diff --git a/collects/scribble/private/on-demand.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt similarity index 100% rename from collects/scribble/private/on-demand.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/on-demand.rkt diff --git a/collects/scribble/private/provide-structs.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt similarity index 100% rename from collects/scribble/private/provide-structs.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/provide-structs.rkt diff --git a/collects/scribble/private/qsloc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt similarity index 100% rename from collects/scribble/private/qsloc.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/qsloc.rkt diff --git a/collects/scribble/private/render-utils.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt similarity index 100% rename from collects/scribble/private/render-utils.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/render-utils.rkt diff --git a/collects/scribble/private/run-pdflatex.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt similarity index 100% rename from collects/scribble/private/run-pdflatex.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/private/run-pdflatex.rkt diff --git a/collects/scribble/provide-doc-transform.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt similarity index 100% rename from collects/scribble/provide-doc-transform.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/provide-doc-transform.rkt diff --git a/collects/scribble/racket.css b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.css similarity index 100% rename from collects/scribble/racket.css rename to pkgs/scribble-pkgs/scribble-lib/scribble/racket.css diff --git a/collects/scribble/racket.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt similarity index 100% rename from collects/scribble/racket.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/racket.rkt diff --git a/collects/scribble/racket.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex similarity index 100% rename from collects/scribble/racket.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/racket.tex diff --git a/collects/scribble/render-struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt similarity index 100% rename from collects/scribble/render-struct.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/render-struct.rkt diff --git a/collects/scribble/render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt similarity index 100% rename from collects/scribble/render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/render.rkt diff --git a/collects/scribble/report/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt similarity index 100% rename from collects/scribble/report/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/report/lang.rkt diff --git a/collects/scribble/report/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt similarity index 100% rename from collects/scribble/report/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/report/lang/reader.rkt diff --git a/collects/scribble/run.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt similarity index 100% rename from collects/scribble/run.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/run.rkt diff --git a/collects/scribble/scheme.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt similarity index 100% rename from collects/scribble/scheme.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/scheme.rkt diff --git a/collects/scribble/scribble-common.js b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js similarity index 100% rename from collects/scribble/scribble-common.js rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-common.js diff --git a/collects/scribble/scribble-prefix.html b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html similarity index 100% rename from collects/scribble/scribble-prefix.html rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.html diff --git a/collects/scribble/scribble-prefix.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex similarity index 100% rename from collects/scribble/scribble-prefix.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-prefix.tex diff --git a/collects/scribble/scribble-skull.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex similarity index 100% rename from collects/scribble/scribble-skull.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-skull.tex diff --git a/collects/scribble/scribble-style.css b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css similarity index 100% rename from collects/scribble/scribble-style.css rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.css diff --git a/collects/scribble/scribble-style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex similarity index 100% rename from collects/scribble/scribble-style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble-style.tex diff --git a/collects/scribble/scribble.css b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css similarity index 100% rename from collects/scribble/scribble.css rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble.css diff --git a/collects/scribble/scribble.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex similarity index 100% rename from collects/scribble/scribble.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/scribble.tex diff --git a/collects/scribble/search.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt similarity index 100% rename from collects/scribble/search.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/search.rkt diff --git a/collects/scribble/sigplan.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt similarity index 100% rename from collects/scribble/sigplan.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan.rkt diff --git a/collects/scribble/sigplan/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt similarity index 100% rename from collects/scribble/sigplan/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang.rkt diff --git a/collects/scribble/sigplan/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt similarity index 100% rename from collects/scribble/sigplan/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/lang/reader.rkt diff --git a/collects/scribble/sigplan/sigplan.css b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css similarity index 100% rename from collects/scribble/sigplan/sigplan.css rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.css diff --git a/collects/scribble/sigplan/sigplan.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex similarity index 100% rename from collects/scribble/sigplan/sigplan.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplan.tex diff --git a/collects/scribble/sigplan/sigplanconf.cls b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls similarity index 100% rename from collects/scribble/sigplan/sigplanconf.cls rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/sigplanconf.cls diff --git a/collects/scribble/sigplan/style.tex b/pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex similarity index 100% rename from collects/scribble/sigplan/style.tex rename to pkgs/scribble-pkgs/scribble-lib/scribble/sigplan/style.tex diff --git a/collects/scribble/srcdoc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt similarity index 100% rename from collects/scribble/srcdoc.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/srcdoc.rkt diff --git a/collects/scribble/struct.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt similarity index 100% rename from collects/scribble/struct.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/struct.rkt diff --git a/collects/scribble/tag.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt similarity index 100% rename from collects/scribble/tag.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/tag.rkt diff --git a/collects/scribble/text-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt similarity index 100% rename from collects/scribble/text-render.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text-render.rkt diff --git a/collects/scribble/text.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text.rkt similarity index 100% rename from collects/scribble/text.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text.rkt diff --git a/collects/scribble/text/lang.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/lang.rkt similarity index 100% rename from collects/scribble/text/lang.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/lang.rkt diff --git a/collects/scribble/text/lang/reader.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/lang/reader.rkt similarity index 100% rename from collects/scribble/text/lang/reader.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/lang/reader.rkt diff --git a/collects/scribble/text/main.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/main.rkt similarity index 100% rename from collects/scribble/text/main.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/main.rkt diff --git a/collects/scribble/text/output.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/output.rkt similarity index 100% rename from collects/scribble/text/output.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/output.rkt diff --git a/collects/scribble/text/syntax-utils.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/syntax-utils.rkt similarity index 99% rename from collects/scribble/text/syntax-utils.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/syntax-utils.rkt index e39e7f4b..3240a1d3 100644 --- a/collects/scribble/text/syntax-utils.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/text/syntax-utils.rkt @@ -172,7 +172,7 @@ #'(process-begin/text begin/collect begin expr ...)])) ;; include for templates -(require (for-syntax scheme/base (prefix-in scribble: "../reader.rkt") syntax/parse) +(require (for-syntax scheme/base (prefix-in scribble: scribble/reader) syntax/parse) scheme/include) (define-syntax (include/text stx) (syntax-case stx () diff --git a/collects/scribble/text/wrap.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/text/wrap.rkt similarity index 100% rename from collects/scribble/text/wrap.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/text/wrap.rkt diff --git a/collects/scribble/urls.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt similarity index 100% rename from collects/scribble/urls.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/urls.rkt diff --git a/collects/scribble/xref.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt similarity index 100% rename from collects/scribble/xref.rkt rename to pkgs/scribble-pkgs/scribble-lib/scribble/xref.rkt diff --git a/pkgs/scribble-pkgs/scribble/info.rkt b/pkgs/scribble-pkgs/scribble/info.rkt new file mode 100644 index 00000000..a227d62b --- /dev/null +++ b/pkgs/scribble-pkgs/scribble/info.rkt @@ -0,0 +1,4 @@ +#lang setup/infotab + +(define deps '("scribble-lib" + "scribble-doc")) diff --git a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt b/pkgs/unstable-parameter-group-lib/info.rkt similarity index 95% rename from collects/tests/pkg/test-pkgs/pkg-z/info.rkt rename to pkgs/unstable-parameter-group-lib/info.rkt index 13a63c48..c14a2ca4 100644 --- a/collects/tests/pkg/test-pkgs/pkg-z/info.rkt +++ b/pkgs/unstable-parameter-group-lib/info.rkt @@ -1,2 +1 @@ #lang setup/infotab - diff --git a/collects/help/help.rkt b/racket/lib/collects/help/help.rkt similarity index 100% rename from collects/help/help.rkt rename to racket/lib/collects/help/help.rkt diff --git a/racket/lib/collects/help/info.rkt b/racket/lib/collects/help/info.rkt new file mode 100644 index 00000000..99ae5482 --- /dev/null +++ b/racket/lib/collects/help/info.rkt @@ -0,0 +1,3 @@ +#lang setup/infotab + +(define compile-omit-files '("tests")) diff --git a/collects/help/search.rkt b/racket/lib/collects/help/search.rkt similarity index 100% rename from collects/help/search.rkt rename to racket/lib/collects/help/search.rkt diff --git a/collects/help/tests/test-docs-complete.rkt b/racket/lib/collects/help/tests/test-docs-complete.rkt similarity index 100% rename from collects/help/tests/test-docs-complete.rkt rename to racket/lib/collects/help/tests/test-docs-complete.rkt