diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss index 5e350338..25382df3 100644 --- a/collects/scribble/html-render.ss +++ b/collects/scribble/html-render.ss @@ -192,12 +192,16 @@ [else (super render-element e part ht)]))) (define/override (render-table t part ht) - `((table ((cellspacing "0") ,@(case (table-style t) - [(boxed) '((width "100%") (bgcolor "#E8E8FF"))] - [(centered) '((align "center"))] - [(at-right) '((align "right"))] - [(at-left) '((align "left"))] - [else null])) + `((table ((cellspacing "0") + ,@(case (table-style t) + [(boxed) '((class "boxed"))] + [(centered) '((align "center"))] + [(at-right) '((align "right"))] + [(at-left) '((align "left"))] + [else null]) + ,@(if (string? (table-style t)) + `((class ,(table-style t))) + null)) ,@(map (lambda (flows) `(tr ,@(map (lambda (d a va) `(td (,@(case a diff --git a/collects/scribble/latex-render.ss b/collects/scribble/latex-render.ss index f4ee8f6d..c171c0d1 100644 --- a/collects/scribble/latex-render.ss +++ b/collects/scribble/latex-render.ss @@ -49,6 +49,7 @@ (define-color "schemevaluelink" "blue") (define-color "schemeresult" "ResultColor") (define-color "schemestdout" "OutputColor") + (define-color "schememeta" "IdentifierColor") (define-color "schemevariablecol" "IdentifierColor") (printf "\\newcommand{\\schemevariable}[1]{{\\schemevariablecol{\\textsl{#1}}}}\n") (define-color "schemeerrorcol" "red") diff --git a/collects/scribble/manual.ss b/collects/scribble/manual.ss index 28ffad59..c733eb0d 100644 --- a/collects/scribble/manual.ss +++ b/collects/scribble/manual.ss @@ -338,7 +338,7 @@ (list (make-flow (list (make-table - '((valignment top top top top top)) + "prototype" (list (list (to-flow @@ -383,11 +383,7 @@ (make-flow (list (make-table - `((valignment baseline baseline baseline baseline - baseline baseline - ,@(if (has-optional? v) - '(baseline baseline baseline baseline) - null))) + "argcontract" (list (let ([v (if (keyword? (car v)) (cdr v) diff --git a/collects/scribble/scheme.ss b/collects/scribble/scheme.ss index 8c6eccc3..f3447b6c 100644 --- a/collects/scribble/scheme.ss +++ b/collects/scribble/scheme.ss @@ -405,7 +405,7 @@ (unless (null? content) (finish-line!)) (if multi-line? - (make-table #f (map list (reverse docs))) + (make-table "schemeblock" (map list (reverse docs))) (make-sized-element #f (reverse content) dest-col)))) (define (to-element c) diff --git a/collects/scribble/scribble.css b/collects/scribble/scribble.css index 48c6f62f..915aec72 100644 --- a/collects/scribble/scribble.css +++ b/collects/scribble/scribble.css @@ -141,6 +141,27 @@ font-family: serif; } + .boxed { + width: 100%; + background-color: #E8E8FF; + } + + .prototype td { + vertical-align: baseline; + } + + .schemeblock td { + vertical-align: baseline; + } + + .argcontract td { + vertical-align: baseline; + } + + .centered { + horiz-align: center; + } + .verbatim em { font-family: serif; }