From caf2595612ec62db63d6e07835261d07cc2940f6 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Sat, 28 Jun 2025 13:28:36 -0700 Subject: [PATCH 1/2] Declare deprecated aliases --- scribble-lib/scribble/private/manual-form.rkt | 10 +++- .../scribble/private/manual-scheme.rkt | 60 ++++++++++++------- .../scribble/private/manual-style.rkt | 16 +++-- scribble-lib/scribble/struct.rkt | 28 ++++++--- 4 files changed, 79 insertions(+), 35 deletions(-) diff --git a/scribble-lib/scribble/private/manual-form.rkt b/scribble-lib/scribble/private/manual-form.rkt index e3a4abd106..1a5f73a36f 100644 --- a/scribble-lib/scribble/private/manual-form.rkt +++ b/scribble-lib/scribble/private/manual-form.rkt @@ -9,6 +9,7 @@ "manual-vars.rkt" "manual-scheme.rkt" "manual-bind.rkt" + racket/deprecation racket/list (for-syntax racket/base syntax/parse @@ -22,12 +23,17 @@ specsubform/inline defsubidform defsubform defsubform* racketgrammar racketgrammar* - (rename-out [racketgrammar schemegrammar] - [racketgrammar* schemegrammar*]) + schemegrammar + schemegrammar* var svar (for-syntax kind-kw id-kw link-target?-kw literals-kw subs-kw contracts-kw)) + +(define-deprecated-alias schemegrammar racketgrammar) +(define-deprecated-alias schemegrammar* racketgrammar*) + + (begin-for-syntax (define-splicing-syntax-class kind-kw #:description "#:kind keyword" diff --git a/scribble-lib/scribble/private/manual-scheme.rkt b/scribble-lib/scribble/private/manual-scheme.rkt index bc3be5dc8e..4a5ddeaa66 100644 --- a/scribble-lib/scribble/private/manual-scheme.rkt +++ b/scribble-lib/scribble/private/manual-scheme.rkt @@ -9,7 +9,8 @@ "manual-utils.rkt" ;; used via datum->syntax "on-demand.rkt" (for-syntax racket/base) - (for-label racket/base)) + (for-label racket/base) + racket/deprecation) (provide racketblock RACKETBLOCK racketblock/form racketblock0 RACKETBLOCK0 racketblock0/form @@ -24,25 +25,44 @@ racketmodname racketmodlink indexed-racket racketlink - - (rename-out [racketblock schemeblock] - [RACKETBLOCK SCHEMEBLOCK] - [racketblock/form schemeblock/form] - [racketblock0 schemeblock0] - [RACKETBLOCK0 SCHEMEBLOCK0] - [racketblock0/form schemeblock0/form] - [racketblockelem schemeblockelem] - [racketinput schemeinput] - [racketmod schememod] - [racket scheme] - [RACKET SCHEME] - [racket/form scheme/form] - [racketresult schemeresult] - [racketid schemeid] - [racketmodname schememodname] - [racketmodlink schememodlink] - [indexed-racket indexed-scheme] - [racketlink schemelink])) + schemeblock + SCHEMEBLOCK + schemeblock/form + schemeblock0 + SCHEMEBLOCK0 + schemeblock0/form + schemeblockelem + schemeinput + schememod + scheme + SCHEME + scheme/form + schemeresult + schemeid + schememodname + schememodlink + indexed-scheme) + + +(define-deprecated-alias schemeblock racketblock) +(define-deprecated-alias SCHEMEBLOCK RACKETBLOCK) +(define-deprecated-alias schemeblock/form racketblock/form) +(define-deprecated-alias schemeblock0 racketblock0) +(define-deprecated-alias SCHEMEBLOCK0 RACKETBLOCK0) +(define-deprecated-alias schemeblock0/form racketblock0/form) +(define-deprecated-alias schemeblockelem racketblockelem) +(define-deprecated-alias schemeinput racketinput) +(define-deprecated-alias schememod racketmod) +(define-deprecated-alias scheme racket) +(define-deprecated-alias SCHEME RACKET) +(define-deprecated-alias scheme/form racket/form) +(define-deprecated-alias schemeresult racketresult) +(define-deprecated-alias schemeid racketid) +(define-deprecated-alias schememodname racketmodname) +(define-deprecated-alias schememodlink racketmodlink) +(define-deprecated-alias indexed-scheme indexed-racket) +(define-deprecated-alias schemelink racketlink) + (define-code racketblock0 to-paragraph) (define-code racketblock to-block-paragraph) diff --git a/scribble-lib/scribble/private/manual-style.rkt b/scribble-lib/scribble/private/manual-style.rkt index a4b855628e..a2c18c1d78 100644 --- a/scribble-lib/scribble/private/manual-style.rkt +++ b/scribble-lib/scribble/private/manual-style.rkt @@ -10,20 +10,28 @@ "manual-utils.rkt" "on-demand.rkt" "manual-sprop.rkt" + racket/deprecation racket/list racket/contract/base racket/string) -(provide (rename-out [hyperlink link]) - (rename-out [other-doc other-manual]) - (rename-out [centered centerline]) +(provide link + other-manual + centerline image - (rename-out [image image/plain]) + image/plain itemize aux-elem code-inset) (provide/contract [filebox (((or/c core:element? string?)) () #:rest (listof pre-flow?) . ->* . block?)]) + +(define-deprecated-alias link hyperlink) +(define-deprecated-alias other-manual other-doc) +(define-deprecated-alias centerline centered) +(define-deprecated-alias image/plain image) + + (define styling-f/c (() () #:rest (listof pre-content?) . ->* . element?)) (define-syntax-rule (provide-styling id ...) diff --git a/scribble-lib/scribble/struct.rkt b/scribble-lib/scribble/struct.rkt index a5b38f12d6..5a08db9d74 100644 --- a/scribble-lib/scribble/struct.rkt +++ b/scribble-lib/scribble/struct.rkt @@ -1,6 +1,7 @@ #lang racket/base (require (for-syntax racket/base) racket/contract/base + racket/deprecation racket/provide-syntax racket/struct-info (rename-in (except-in "core.rkt" target-url struct:target-url target-url? target-url-addr) @@ -56,6 +57,15 @@ [(_ [id (field-id ...)]...) #'(combine-out (struct*-out [id (field-id ...)]) ...)])) + +(define-deprecated-alias part-flow part-blocks) +(define-deprecated-alias styled-paragraph? paragraph?) +(define-deprecated-alias styled-paragraph-style paragraph-style) +(define-deprecated-alias styled-itemization? itemization?) +(define-deprecated-alias styled-itemization-style itemization-style) +(define-deprecated-alias element->string content->string) + + (provide (struct-out collect-info) (struct-out resolve-info) tag? block? @@ -63,16 +73,16 @@ make-flow flow? flow-paragraphs (except-out (compat-out part) part-title-content) - (rename-out [part-blocks part-flow] - [part-title-content/compat part-title-content]) + part-flow + (rename-out [part-title-content/compat part-title-content]) make-versioned-part versioned-part? make-unnumbered-part unnumbered-part? (except-out (compat-out paragraph) paragraph-content) (rename-out [paragraph-content/compat paragraph-content]) make-styled-paragraph - (rename-out [paragraph? styled-paragraph?] - [paragraph-style styled-paragraph-style]) + styled-paragraph? + styled-paragraph-style make-omitable-paragraph omitable-paragraph? (compat-out table) @@ -82,9 +92,9 @@ (struct-out delayed-block) (compat-out itemization) - (rename-out [itemization-blockss itemization-flows] - [itemization? styled-itemization?] - [itemization-style styled-itemization-style]) + styled-itemization? + styled-itemization-style + (rename-out [itemization-blockss itemization-flows]) make-styled-itemization make-blockquote @@ -127,8 +137,8 @@ ; generate-tag tag-key current-tag-prefixes add-current-tag-prefix content->string - (rename-out [content->string element->string] - [content-width element-width]) + element->string + (rename-out [content-width element-width]) ; strip-aux block-width From 26743453c74d90a2606a47aa3a831e77a69ebba1 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Sat, 28 Jun 2025 13:33:32 -0700 Subject: [PATCH 2/2] Git rid of a dead function This wasn't actually used, and now it conflicts with the deprecated alias definition. --- scribble-lib/scribble/private/manual-style.rkt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scribble-lib/scribble/private/manual-style.rkt b/scribble-lib/scribble/private/manual-style.rkt index a2c18c1d78..562b8fad87 100644 --- a/scribble-lib/scribble/private/manual-style.rkt +++ b/scribble-lib/scribble/private/manual-style.rkt @@ -211,12 +211,6 @@ (make-v+u-link (nonbreaking (racketresultfont "#")))) -(define (link url - #:underline? [underline? #t] - #:style [style (if underline? #f "plainlink")] - . str) - (apply hyperlink url #:style (if style (make-style style null) plain) str)) - (define (math . s) (define c (decode-content s)) (make-element