From ca040ea42a7fa2bfb5e5332bee81ab41fec28b82 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 26 Oct 2010 09:26:51 -0400 Subject: [PATCH] Move `meta/web/html' to `scribble/html'. (See http://lists.racket-lang.org/dev/archive/2010-October/004691.html for a discussion on calling it `html' rather than `xhtml'.) --- collects/meta/props | 3 +++ collects/meta/web/README | 3 --- collects/meta/web/build.rkt | 2 +- collects/meta/web/common/extras.rkt | 2 +- collects/meta/web/common/layout.rkt | 2 +- collects/meta/web/common/links.rkt | 2 +- collects/meta/web/common/main.rkt | 4 ++-- collects/meta/web/common/resources.rkt | 2 +- collects/meta/web/common/utils.rkt | 2 +- collects/meta/web/stubs/pre.rkt | 8 ++++---- collects/{meta/web => scribble}/html.rkt | 0 collects/{meta/web => scribble}/html/html.rkt | 0 collects/{meta/web => scribble}/html/main.rkt | 0 collects/{meta/web => scribble}/html/resource.rkt | 0 collects/{meta/web => scribble}/html/xml.rkt | 0 15 files changed, 15 insertions(+), 15 deletions(-) rename collects/{meta/web => scribble}/html.rkt (100%) rename collects/{meta/web => scribble}/html/html.rkt (100%) rename collects/{meta/web => scribble}/html/main.rkt (100%) rename collects/{meta/web => scribble}/html/resource.rkt (100%) rename collects/{meta/web => scribble}/html/xml.rkt (100%) diff --git a/collects/meta/props b/collects/meta/props index 49ea9d31ee..9750d6ec45 100755 --- a/collects/meta/props +++ b/collects/meta/props @@ -1240,8 +1240,11 @@ path/s is either such a string or a list of them. "collects/schemeunit" responsible (jay) "collects/schemeunit/gui.rkt" drdr:command-line (gracket-text "-t" *) "collects/scribble" responsible (mflatt eli) +"collects/scribble/html" responsible (eli) +"collects/scribble/html.rkt" responsible (eli) "collects/scribble/run.rkt" drdr:command-line (mzc *) "collects/scribble/text" responsible (eli) +"collects/scribble/text.rkt" responsible (eli) "collects/scribble/tools/drracket-buttons.rkt" drdr:command-line (gracket-text *) "collects/scribble/tools/private/mk-drs-bitmaps.rkt" drdr:command-line (gracket-text * "skip") "collects/scribblings" responsible (mflatt eli robby matthias) diff --git a/collects/meta/web/README b/collects/meta/web/README index 70f1f3df26..be6e6c259d 100644 --- a/collects/meta/web/README +++ b/collects/meta/web/README @@ -1,6 +1,3 @@ -* html: generic shared code for (X)HTML generation (tag output and - resource rendering and referring). - * common: specific code for the PLT web pages. * www: actual content of main site. diff --git a/collects/meta/web/build.rkt b/collects/meta/web/build.rkt index 48d00cf98f..689707974a 100755 --- a/collects/meta/web/build.rkt +++ b/collects/meta/web/build.rkt @@ -7,7 +7,7 @@ exec "$exe" "$0" "$@" #lang racket/base -(require racket/cmdline racket/runtime-path racket/file meta/web/html +(require racket/cmdline racket/runtime-path racket/file scribble/html "common/distribute.rkt" "config.rkt" "navbar.rkt") (define build-mode #f) diff --git a/collects/meta/web/common/extras.rkt b/collects/meta/web/common/extras.rkt index fb4ca26a63..31f721dc72 100644 --- a/collects/meta/web/common/extras.rkt +++ b/collects/meta/web/common/extras.rkt @@ -1,4 +1,4 @@ -#lang at-exp s-exp meta/web/html +#lang at-exp s-exp scribble/html ;; list of a header paragraphs and sub paragraphs (don't use `p' since it looks ;; like they should not be nested) diff --git a/collects/meta/web/common/layout.rkt b/collects/meta/web/common/layout.rkt index b9740a7d8c..722071508a 100644 --- a/collects/meta/web/common/layout.rkt +++ b/collects/meta/web/common/layout.rkt @@ -1,4 +1,4 @@ -#lang at-exp s-exp meta/web/html +#lang at-exp s-exp scribble/html (require (for-syntax racket/base syntax/name) "utils.rkt" "resources.rkt") diff --git a/collects/meta/web/common/links.rkt b/collects/meta/web/common/links.rkt index 0f184af9f4..c5ab849beb 100644 --- a/collects/meta/web/common/links.rkt +++ b/collects/meta/web/common/links.rkt @@ -1,4 +1,4 @@ -#lang at-exp s-exp meta/web/html +#lang at-exp s-exp scribble/html (define-syntax-rule (define* id E) (begin (define id E) (provide id))) diff --git a/collects/meta/web/common/main.rkt b/collects/meta/web/common/main.rkt index fa4eabf636..119356b679 100644 --- a/collects/meta/web/common/main.rkt +++ b/collects/meta/web/common/main.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require meta/web/html +(require scribble/html "layout.rkt" "resources.rkt" "extras.rkt" "links.rkt" "utils.rkt") -(provide (all-from-out meta/web/html +(provide (all-from-out scribble/html "layout.rkt" "resources.rkt" "extras.rkt" "links.rkt" "utils.rkt")) diff --git a/collects/meta/web/common/resources.rkt b/collects/meta/web/common/resources.rkt index 4d19540964..c79b1157c6 100644 --- a/collects/meta/web/common/resources.rkt +++ b/collects/meta/web/common/resources.rkt @@ -1,4 +1,4 @@ -#lang at-exp s-exp meta/web/html +#lang at-exp s-exp scribble/html ;; These are some resources that are shared across different toplevel ;; sites. They could be included from a single place, but then when one diff --git a/collects/meta/web/common/utils.rkt b/collects/meta/web/common/utils.rkt index 9c5e92119d..ca1e2ff745 100644 --- a/collects/meta/web/common/utils.rkt +++ b/collects/meta/web/common/utils.rkt @@ -1,4 +1,4 @@ -#lang at-exp s-exp meta/web/html +#lang at-exp s-exp scribble/html (require (for-syntax scheme/base)) diff --git a/collects/meta/web/stubs/pre.rkt b/collects/meta/web/stubs/pre.rkt index 8bf907205e..c10ac44726 100644 --- a/collects/meta/web/stubs/pre.rkt +++ b/collects/meta/web/stubs/pre.rkt @@ -55,10 +55,10 @@ @~ It is also easy to setup a script that will automate the process of retrieving the @tt{tgz} file, unpacking and installing it. This is - explained in more details in @a[href: "script.html"]{scripts}. In - addition to being convenient for updating your tree, it can be used by an - automatic job scheduler (for example, a cron job on Unix) to make tree - that is always updated.} + explained in more details in @pre-scripts{scripts}. In addition to being + convenient for updating your tree, it can be used by an automatic job + scheduler (for example, a cron job on Unix) to make tree that is always + updated.} @hr @version-hole}) diff --git a/collects/meta/web/html.rkt b/collects/scribble/html.rkt similarity index 100% rename from collects/meta/web/html.rkt rename to collects/scribble/html.rkt diff --git a/collects/meta/web/html/html.rkt b/collects/scribble/html/html.rkt similarity index 100% rename from collects/meta/web/html/html.rkt rename to collects/scribble/html/html.rkt diff --git a/collects/meta/web/html/main.rkt b/collects/scribble/html/main.rkt similarity index 100% rename from collects/meta/web/html/main.rkt rename to collects/scribble/html/main.rkt diff --git a/collects/meta/web/html/resource.rkt b/collects/scribble/html/resource.rkt similarity index 100% rename from collects/meta/web/html/resource.rkt rename to collects/scribble/html/resource.rkt diff --git a/collects/meta/web/html/xml.rkt b/collects/scribble/html/xml.rkt similarity index 100% rename from collects/meta/web/html/xml.rkt rename to collects/scribble/html/xml.rkt