suzanne.soy/scribble-enhanced
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

improve layout of proc defns by using tables less

Browse Source 
svn: r6624

original commit: 6b5c0ed0d90ef355755d280b8740bdfffe20ea7c
This commit is contained in:
Matthew Flatt 2007-06-13 03:35:47 +00:00
parent 7c05bbb8ea
commit 8d484595ef
3 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
collects/scribble/manual.ss
View File

@ -294,7 +294,13 @@
(syntax-rules () (syntax-rules ()
[(_ id) (*var 'id)])) [(_ 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) (define (*defproc prototypes arg-contractss result-contracts content-thunk)
(let ([spacer (hspace 1)] (let ([spacer (hspace 1)]
@ -336,44 +342,43 @@
(append (append
(list (list
(list (make-flow (list (make-flow
(list (make-table-if-necessary
(make-table "prototype"
"prototype" (list
(list (list
(list (to-flow
(to-flow (let-values ([(required optional more-required)
(let-values ([(required optional more-required) (let loop ([a (cdr prototype)][r-accum null])
(let loop ([a (cdr prototype)][r-accum null]) (if (or (null? a)
(if (or (null? a) (and (has-optional? (car a))))
(and (has-optional? (car a)))) (let ([req (reverse r-accum)])
(let ([req (reverse r-accum)]) (let loop ([a a][o-accum null])
(let loop ([a a][o-accum null]) (if (or (null? a)
(if (or (null? a) (not (has-optional? (car a))))
(not (has-optional? (car a)))) (values req (reverse o-accum) a)
(values req (reverse o-accum) a) (loop (cdr a) (cons (car a) o-accum)))))
(loop (cdr a) (cons (car a) o-accum))))) (loop (cdr a) (cons (car a) r-accum))))])
(loop (cdr a) (cons (car a) r-accum))))]) (to-element (append
(to-element (append (list (if first?
(list (if first? (make-target-element
(make-target-element #f
#f (list (to-element (car prototype)))
(list (to-element (car prototype))) (register-scheme-definition (car prototype)))
(register-scheme-definition (car prototype))) (to-element (car prototype))))
(to-element (car prototype)))) (map arg->elem required)
(map arg->elem required) (if (null? optional)
(if (null? optional) null
null (list
(list (to-element
(to-element (syntax-property
(syntax-property (syntax-ize (map arg->elem optional) 0)
(syntax-ize (map arg->elem optional) 0) 'paren-shape
'paren-shape #\?))))
#\?)))) (map arg->elem more-required)))))
(map arg->elem more-required))))) (to-flow spacer)
(to-flow spacer) (to-flow 'rarr)
(to-flow 'rarr) (to-flow spacer)
(to-flow spacer) (make-flow (list (result-contract)))))))))
(make-flow (list (result-contract))))))))))
(apply append (apply append
(map (lambda (v arg-contract) (map (lambda (v arg-contract)
(cond (cond
@ -381,27 +386,26 @@
(list (list
(list (list
(make-flow (make-flow
(list (make-table-if-necessary
(make-table "argcontract"
"argcontract" (list
(list (let ([v (if (keyword? (car v))
(let ([v (if (keyword? (car v)) (cdr v)
(cdr v) v)])
v)]) (append
(append (list
(list (to-flow (hspace 2))
(to-flow (hspace 2)) (to-flow (arg->elem v))
(to-flow (arg->elem v)) (to-flow spacer)
(to-flow spacer) (to-flow ":")
(to-flow ":") (to-flow spacer)
(to-flow spacer) (make-flow (list (arg-contract))))
(make-flow (list (arg-contract)))) (if (has-optional? v)
(if (has-optional? v) (list (to-flow spacer)
(list (to-flow spacer) (to-flow "=")
(to-flow "=") (to-flow spacer)
(to-flow spacer) (to-flow (to-element (caddr v))))
(to-flow (to-element (caddr v)))) null))))))))]
null)))))))))]
[else null])) [else null]))
(cdr prototype) (cdr prototype)
arg-contracts)))) arg-contracts))))

4
collects/scribble/scheme.ss
View File

@ -405,7 +405,9 @@
(unless (null? content) (unless (null? content)
(finish-line!)) (finish-line!))
(if multi-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)))) (make-sized-element #f (reverse content) dest-col))))
(define (to-element c) (define (to-element c)

9
collects/scribble/scribble.css
View File

@ -9,6 +9,11 @@
margin-right: auto; margin-right: auto;
} }
table td {
padding-left: 0;
padding-right: 0;
}
.main { .main {
width: 35em; width: 35em;
text-align: left; text-align: left;
@ -147,7 +152,7 @@
} }
.prototype td { .prototype td {
vertical-align: baseline; vertical-align: top;
} }
.schemeblock td { .schemeblock td {
@ -155,7 +160,7 @@
} }
.argcontract td { .argcontract td {
vertical-align: baseline; vertical-align: top;
} }
.centered { .centered {