From 8d484595ef85f255a1e8fa0eff09fa2ee281df36 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 13 Jun 2007 03:35:47 +0000 Subject: [PATCH] improve layout of proc defns by using tables less svn: r6624 original commit: 6b5c0ed0d90ef355755d280b8740bdfffe20ea7c --- collects/scribble/manual.ss | 122 +++++++++++++++++---------------- collects/scribble/scheme.ss | 4 +- collects/scribble/scribble.css | 9 ++- 3 files changed, 73 insertions(+), 62 deletions(-) diff --git a/collects/scribble/manual.ss b/collects/scribble/manual.ss index c733eb0d..d87a9bc4 100644 --- a/collects/scribble/manual.ss +++ b/collects/scribble/manual.ss @@ -294,7 +294,13 @@ (syntax-rules () [(_ id) (*var 'id)])) - + (define (make-table-if-necessary style content) + (if (= 1 (length content)) + (let ([paras (apply append (map flow-paragraphs (car content)))]) + (if (andmap paragraph? paras) + (list (make-paragraph (apply append (map paragraph-content paras)))) + (list (make-table style content)))) + (list (make-table style content)))) (define (*defproc prototypes arg-contractss result-contracts content-thunk) (let ([spacer (hspace 1)] @@ -336,44 +342,43 @@ (append (list (list (make-flow - (list - (make-table - "prototype" + (make-table-if-necessary + "prototype" + (list (list - (list - (to-flow - (let-values ([(required optional more-required) - (let loop ([a (cdr prototype)][r-accum null]) - (if (or (null? a) - (and (has-optional? (car a)))) - (let ([req (reverse r-accum)]) - (let loop ([a a][o-accum null]) - (if (or (null? a) - (not (has-optional? (car a)))) - (values req (reverse o-accum) a) - (loop (cdr a) (cons (car a) o-accum))))) - (loop (cdr a) (cons (car a) r-accum))))]) - (to-element (append - (list (if first? - (make-target-element - #f - (list (to-element (car prototype))) - (register-scheme-definition (car prototype))) - (to-element (car prototype)))) - (map arg->elem required) - (if (null? optional) - null - (list - (to-element - (syntax-property - (syntax-ize (map arg->elem optional) 0) - 'paren-shape - #\?)))) - (map arg->elem more-required))))) - (to-flow spacer) - (to-flow 'rarr) - (to-flow spacer) - (make-flow (list (result-contract)))))))))) + (to-flow + (let-values ([(required optional more-required) + (let loop ([a (cdr prototype)][r-accum null]) + (if (or (null? a) + (and (has-optional? (car a)))) + (let ([req (reverse r-accum)]) + (let loop ([a a][o-accum null]) + (if (or (null? a) + (not (has-optional? (car a)))) + (values req (reverse o-accum) a) + (loop (cdr a) (cons (car a) o-accum))))) + (loop (cdr a) (cons (car a) r-accum))))]) + (to-element (append + (list (if first? + (make-target-element + #f + (list (to-element (car prototype))) + (register-scheme-definition (car prototype))) + (to-element (car prototype)))) + (map arg->elem required) + (if (null? optional) + null + (list + (to-element + (syntax-property + (syntax-ize (map arg->elem optional) 0) + 'paren-shape + #\?)))) + (map arg->elem more-required))))) + (to-flow spacer) + (to-flow 'rarr) + (to-flow spacer) + (make-flow (list (result-contract))))))))) (apply append (map (lambda (v arg-contract) (cond @@ -381,27 +386,26 @@ (list (list (make-flow - (list - (make-table - "argcontract" - (list - (let ([v (if (keyword? (car v)) - (cdr v) - v)]) - (append - (list - (to-flow (hspace 2)) - (to-flow (arg->elem v)) - (to-flow spacer) - (to-flow ":") - (to-flow spacer) - (make-flow (list (arg-contract)))) - (if (has-optional? v) - (list (to-flow spacer) - (to-flow "=") - (to-flow spacer) - (to-flow (to-element (caddr v)))) - null)))))))))] + (make-table-if-necessary + "argcontract" + (list + (let ([v (if (keyword? (car v)) + (cdr v) + v)]) + (append + (list + (to-flow (hspace 2)) + (to-flow (arg->elem v)) + (to-flow spacer) + (to-flow ":") + (to-flow spacer) + (make-flow (list (arg-contract)))) + (if (has-optional? v) + (list (to-flow spacer) + (to-flow "=") + (to-flow spacer) + (to-flow (to-element (caddr v)))) + null))))))))] [else null])) (cdr prototype) arg-contracts)))) diff --git a/collects/scribble/scheme.ss b/collects/scribble/scheme.ss index f3447b6c..28570a0a 100644 --- a/collects/scribble/scheme.ss +++ b/collects/scribble/scheme.ss @@ -405,7 +405,9 @@ (unless (null? content) (finish-line!)) (if multi-line? - (make-table "schemeblock" (map list (reverse docs))) + (if (= 1 (length docs)) + (car (flow-paragraphs (car 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 915aec72..748d3b19 100644 --- a/collects/scribble/scribble.css +++ b/collects/scribble/scribble.css @@ -9,6 +9,11 @@ margin-right: auto; } + table td { + padding-left: 0; + padding-right: 0; + } + .main { width: 35em; text-align: left; @@ -147,7 +152,7 @@ } .prototype td { - vertical-align: baseline; + vertical-align: top; } .schemeblock td { @@ -155,7 +160,7 @@ } .argcontract td { - vertical-align: baseline; + vertical-align: top; } .centered {