diff --git a/scribble-doc/scribblings/scribble/core.scrbl b/scribble-doc/scribblings/scribble/core.scrbl index b7940d2e..78b37fe7 100644 --- a/scribble-doc/scribblings/scribble/core.scrbl +++ b/scribble-doc/scribblings/scribble/core.scrbl @@ -1771,10 +1771,13 @@ HTML that is rendered before and after element content. bytes?)])]{ Used as a @tech{style property} to supply a CSS file (if @racket[path] -is a path, string, or list), URL (if @racket[path] is a @racket[url]) or content (if @racket[path] is a byte -string) to be referenced or included in the generated HTML. This -property can be attached to any style, and all additions are collected -to the top of the generated HTML page. +is a path, string, or list), URL (if @racket[path] is a @racket[url]) +or content (if @racket[path] is a byte string) to be referenced or +included in the generated HTML. This property can be attached to any +style, and all additions are collected and lifted to the enclosing +generated HTML. When the style property is attached to a @tech{part}, +then it is also propagated to any generated HTML for a subpart of the +part. The @racket[path] field can be a result of @racket[path->main-collects-relative].} @@ -1848,6 +1851,15 @@ For a @racket[part] that corresponds to an HTML page, adds content to the @tt{} tag.} +@defstruct[head-addition ([xexpr xexpr/c])]{ + +Like @racket[head-extra] in content, but propagated to enclosing and +nested HTML pages like @racket[css-addition]. Additions to @tt{} +via @racket[head-addition] appear before additions via @racket[head-extra]. + +@history[#:added "1.38"]} + + @defstruct[render-convertible-as ([types (listof (or/c 'png-bytes 'svg-bytes 'gif-bytes))])]{ For a @racket[part] that corresponds to an HTML page, controls how objects that subscribe to the @racketmodname[file/convertible] diff --git a/scribble-lib/info.rkt b/scribble-lib/info.rkt index a80f5a71..f8f64e31 100644 --- a/scribble-lib/info.rkt +++ b/scribble-lib/info.rkt @@ -23,4 +23,4 @@ (define pkg-authors '(mflatt eli)) -(define version "1.37") +(define version "1.38") diff --git a/scribble-lib/scribble/html-properties.rkt b/scribble-lib/scribble/html-properties.rkt index f4df208c..8c6f1475 100644 --- a/scribble-lib/scribble/html-properties.rkt +++ b/scribble-lib/scribble/html-properties.rkt @@ -30,4 +30,5 @@ [link-resource ([path path-string?])] [head-extra ([xexpr xexpr/c])] + [head-addition ([xexpr xexpr/c])] [render-convertible-as ([types (listof (or/c 'png-bytes 'svg-bytes 'gif-bytes))])]) diff --git a/scribble-lib/scribble/html-render.rkt b/scribble-lib/scribble/html-render.rkt index 6a9304b5..e243d8b8 100644 --- a/scribble-lib/scribble/html-render.rkt +++ b/scribble-lib/scribble/html-render.rkt @@ -221,26 +221,17 @@ (string->symbol (alt-tag-name s))))) (define (make-search-box top-path) ; appears on every page - (let ([sa string-append] - [emptylabel "...search manuals..."] - [dimcolor "#888"]) + (let ([emptylabel "...search manuals..."]) `(form ([class "searchform"]) (input ([class "searchbox"] - [style ,(sa "color: "dimcolor";")] + [id "searchbox"] [type "text"] [tabindex "1"] - [value ,emptylabel] + [placeholder ,emptylabel] [title "Enter a search string to search the manuals"] [onkeypress ,(format "return DoSearchKey(event, this, ~s, ~s);" - (version) top-path)] - [onfocus ,(sa "this.style.color=\"black\"; " - "this.style.textAlign=\"left\"; " - "if (this.value == \""emptylabel"\") this.value=\"\";")] - [onblur ,(sa "if (this.value.match(/^ *$/)) {" - " this.style.color=\""dimcolor"\";" - " this.style.textAlign=\"center\";" - " this.value=\""emptylabel"\"; }")]))))) + (version) top-path)]))))) (define search-box (make-search-box "../")) (define top-search-box (make-search-box "")) @@ -904,6 +895,7 @@ (extract js-style-addition? js-style-addition-path) (reverse extra-script-files))) ,(xml:comment "[if IE 6]>