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

minor

Browse Source 
svn: r8430

original commit: ec75cb5a9f57f27d138aa12a3d61db9711c12200
This commit is contained in:
Eli Barzilay 2008-01-27 07:00:07 +00:00
parent 81179a7eea
commit 40116e1d00
3 changed files with 394 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
collects/scribble/base-render.ss
View File

@ -1,21 +1,21 @@
(module base-render scheme/base #lang scheme/base
(require "struct.ss"
(require "struct.ss"
mzlib/class mzlib/class
mzlib/serialize mzlib/serialize
scheme/file scheme/file
scheme/path scheme/path
setup/main-collects) setup/main-collects)
(provide render%) (provide render%)
(define render% (define render%
(class object% (class object%
(init-field dest-dir) (init-field dest-dir)
(define/public (get-dest-directory) (define/public (get-dest-directory) dest-dir)
dest-dir)
(define/public (get-substitutions) null) (define/public (get-substitutions) null)
@ -25,13 +25,9 @@
(if (or (null? number) (if (or (null? number)
(andmap not number)) (andmap not number))
null null
(cons (cons (let ([s (apply
(let ([s (apply
string-append string-append
(map (lambda (n) (map (lambda (n) (if n (format "~s." n) ""))
(if n
(format "~s." n)
""))
(reverse number)))]) (reverse number)))])
(substring s 0 (sub1 (string-length s)))) (substring s 0 (sub1 (string-length s))))
sep))) sep)))
@ -53,8 +49,8 @@
(define/public (deserialize-info v ci) (define/public (deserialize-info v ci)
(let ([ht (deserialize v)] (let ([ht (deserialize v)]
[in-ht (collect-info-ext-ht ci)]) [in-ht (collect-info-ext-ht ci)])
(hash-table-for-each ht (lambda (k v) (for ([(k v) ht])
(hash-table-put! in-ht k v))))) (hash-table-put! in-ht k v))))
(define/public (get-defined ci) (define/public (get-defined ci)
(hash-table-map (collect-info-ht ci) (lambda (k v) k))) (hash-table-map (collect-info-ht ci) (lambda (k v) k)))
@ -63,9 +59,8 @@
(define/public (transfer-info ci src-ci) (define/public (transfer-info ci src-ci)
(let ([in-ht (collect-info-ext-ht ci)]) (let ([in-ht (collect-info-ext-ht ci)])
(hash-table-for-each (collect-info-ext-ht src-ci) (for ([(k v) (collect-info-ext-ht src-ci)])
(lambda (k v) (hash-table-put! in-ht k v))))
(hash-table-put! in-ht k v)))))
;; ---------------------------------------- ;; ----------------------------------------
;; global-info collection ;; global-info collection
@ -82,12 +77,12 @@
ci)) ci))
(define/public (start-collect ds fns ci) (define/public (start-collect ds fns ci)
(map (lambda (d) (map (lambda (d) (collect-part d #f ci null))
(collect-part d #f ci null))
ds)) ds))
(define/public (collect-part d parent ci number) (define/public (collect-part d parent ci number)
(let ([p-ci (make-collect-info (make-hash-table 'equal) (let ([p-ci (make-collect-info
(make-hash-table 'equal)
(collect-info-ext-ht ci) (collect-info-ext-ht ci)
(collect-info-parts ci) (collect-info-parts ci)
(collect-info-tags ci) (collect-info-tags ci)
@ -108,27 +103,19 @@
(unless (null? parts) (unless (null? parts)
(let ([s (car parts)]) (let ([s (car parts)])
(collect-part s d p-ci (collect-part s d p-ci
(cons (if (unnumbered-part? s) (cons (if (unnumbered-part? s) #f pos)
#f
pos)
number)) number))
(loop (cdr parts) (loop (cdr parts)
(if (unnumbered-part? s) pos (add1 pos)))))) (if (unnumbered-part? s) pos (add1 pos))))))
(hash-table-put! (collect-info-parts ci) (hash-table-put! (collect-info-parts ci)
d d
(make-collected-info (make-collected-info number
number
parent parent
(collect-info-ht p-ci))) (collect-info-ht p-ci)))
(let ([prefix (part-tag-prefix d)]) (let ([prefix (part-tag-prefix d)])
(hash-table-for-each (collect-info-ht p-ci) (for ([(k v) (collect-info-ht p-ci)])
(lambda (k v)
(when (cadr k) (when (cadr k)
(collect-put! ci (collect-put! ci (if prefix (convert-key prefix k) k) v))))))
(if prefix
(convert-key prefix k)
k)
v)))))))
(define/private (convert-key prefix k) (define/private (convert-key prefix k)
(case (car k) (case (car k)
@ -138,31 +125,24 @@
k)] k)]
[(index-entry) [(index-entry)
(let ([v (convert-key prefix (cadr k))]) (let ([v (convert-key prefix (cadr k))])
(if (eq? v (cadr k)) (if (eq? v (cadr k)) k (list 'index-entry v)))]
k
(list 'index-entry v)))]
[else k])) [else k]))
(define/public (collect-part-tags d ci number) (define/public (collect-part-tags d ci number)
(for-each (lambda (t) (for ([t (part-tags d)])
(hash-table-put! (collect-info-ht ci) (hash-table-put! (collect-info-ht ci)
(generate-tag t ci) (generate-tag t ci)
(list (or (part-title-content d) '("???")) (list (or (part-title-content d) '("???")) number))))
number)))
(part-tags d)))
(define/public (collect-content c ci) (define/public (collect-content c ci)
(for-each (lambda (i) (for ([i c]) (collect-element i ci)))
(collect-element i ci))
c))
(define/public (collect-paragraph p ci) (define/public (collect-paragraph p ci)
(collect-content (paragraph-content p) ci)) (collect-content (paragraph-content p) ci))
(define/public (collect-flow p ci) (define/public (collect-flow p ci)
(for-each (lambda (p) (for ([p (flow-paragraphs p)])
(collect-flow-element p ci)) (collect-flow-element p ci)))
(flow-paragraphs p)))
(define/public (collect-flow-element p ci) (define/public (collect-flow-element p ci)
(cond (cond
@ -173,41 +153,32 @@
[else (collect-paragraph p ci)])) [else (collect-paragraph p ci)]))
(define/public (collect-table i ci) (define/public (collect-table i ci)
(for-each (lambda (d) (when (flow? d) (for ([d (apply append (table-flowss i))])
(collect-flow d ci))) (when (flow? d) (collect-flow d ci))))
(apply append (table-flowss i))))
(define/public (collect-itemization i ci) (define/public (collect-itemization i ci)
(for-each (lambda (d) (collect-flow d ci)) (for ([d (itemization-flows i)])
(itemization-flows i))) (collect-flow d ci)))
(define/public (collect-blockquote i ci) (define/public (collect-blockquote i ci)
(for-each (lambda (d) (collect-flow-element d ci)) (for ([d (blockquote-paragraphs i)])
(blockquote-paragraphs i))) (collect-flow-element d ci)))
(define/public (collect-element i ci) (define/public (collect-element i ci)
(if (part-relative-element? i) (if (part-relative-element? i)
(let ([content (let ([content
(or (hash-table-get (collect-info-relatives ci) (or (hash-table-get (collect-info-relatives ci) i #f)
i
#f)
(let ([v ((part-relative-element-collect i) ci)]) (let ([v ((part-relative-element-collect i) ci)])
(hash-table-put! (collect-info-relatives ci) (hash-table-put! (collect-info-relatives ci) i v)
i
v)
v))]) v))])
(collect-content content ci)) (collect-content content ci))
(begin (begin
(when (target-element? i) (when (target-element? i) (collect-target-element i ci))
(collect-target-element i ci)) (when (index-element? i) (collect-index-element i ci))
(when (index-element? i) (when (collect-element? i) ((collect-element-collect i) ci))
(collect-index-element i ci))
(when (collect-element? i)
((collect-element-collect i) ci))
(when (element? i) (when (element? i)
(for-each (lambda (e) (for ([e (element-content i)])
(collect-element e ci)) (collect-element e ci))))))
(element-content i))))))
(define/public (collect-target-element i ci) (define/public (collect-target-element i ci)
(collect-put! ci (collect-put! ci
@ -233,30 +204,25 @@
ri)) ri))
(define/public (start-resolve ds fns ri) (define/public (start-resolve ds fns ri)
(map (lambda (d) (map (lambda (d) (resolve-part d ri)) ds))
(resolve-part d ri))
ds))
(define/public (resolve-part d ri) (define/public (resolve-part d ri)
(when (part-title-content d) (when (part-title-content d)
(resolve-content (part-title-content d) d ri)) (resolve-content (part-title-content d) d ri))
(resolve-flow (part-flow d) d ri) (resolve-flow (part-flow d) d ri)
(for-each (lambda (p) (for ([p (part-parts d)])
(resolve-part p ri)) (resolve-part p ri)))
(part-parts d)))
(define/public (resolve-content c d ri) (define/public (resolve-content c d ri)
(for-each (lambda (i) (for ([i c])
(resolve-element i d ri)) (resolve-element i d ri)))
c))
(define/public (resolve-paragraph p d ri) (define/public (resolve-paragraph p d ri)
(resolve-content (paragraph-content p) d ri)) (resolve-content (paragraph-content p) d ri))
(define/public (resolve-flow p d ri) (define/public (resolve-flow p d ri)
(for-each (lambda (p) (for ([p (flow-paragraphs p)])
(resolve-flow-element p d ri)) (resolve-flow-element p d ri)))
(flow-paragraphs p)))
(define/public (resolve-flow-element p d ri) (define/public (resolve-flow-element p d ri)
(cond (cond
@ -270,30 +236,25 @@
[else (resolve-paragraph p d ri)])) [else (resolve-paragraph p d ri)]))
(define/public (resolve-table i d ri) (define/public (resolve-table i d ri)
(for-each (lambda (f) (when (flow? f) (for ([f (apply append (table-flowss i))])
(resolve-flow f d ri))) (when (flow? f) (resolve-flow f d ri))))
(apply append (table-flowss i))))
(define/public (resolve-itemization i d ri) (define/public (resolve-itemization i d ri)
(for-each (lambda (f) (resolve-flow f d ri)) (for ([f (itemization-flows i)])
(itemization-flows i))) (resolve-flow f d ri)))
(define/public (resolve-blockquote i d ri) (define/public (resolve-blockquote i d ri)
(for-each (lambda (f) (resolve-flow-element f d ri)) (for ([f (blockquote-paragraphs i)])
(blockquote-paragraphs i))) (resolve-flow-element f d ri)))
(define/public (resolve-element i d ri) (define/public (resolve-element i d ri)
(cond (cond
[(part-relative-element? i) [(part-relative-element? i)
(resolve-content (part-relative-element-content i ri) d ri)] (resolve-content (part-relative-element-content i ri) d ri)]
[(delayed-element? i) [(delayed-element? i)
(resolve-content (or (hash-table-get (resolve-info-delays ri) (resolve-content (or (hash-table-get (resolve-info-delays ri) i #f)
i
#f)
(let ([v ((delayed-element-resolve i) this d ri)]) (let ([v ((delayed-element-resolve i) this d ri)])
(hash-table-put! (resolve-info-delays ri) (hash-table-put! (resolve-info-delays ri) i v)
i
v)
v)) v))
d ri)] d ri)]
[(element? i) [(element? i)
@ -305,21 +266,17 @@
(hash-table-put! (resolve-info-delays ri) e v))))] (hash-table-put! (resolve-info-delays ri) e v))))]
[(link-element? i) [(link-element? i)
(resolve-get d ri (link-element-tag i))]) (resolve-get d ri (link-element-tag i))])
(for-each (lambda (e) (for ([e (element-content i)])
(resolve-element e d ri)) (resolve-element e d ri))]))
(element-content i))]))
;; ---------------------------------------- ;; ----------------------------------------
;; render methods ;; render methods
(define/public (render ds fns ri) (define/public (render ds fns ri)
(map (lambda (d fn) (map (lambda (d fn)
(when report-output? (when report-output? (printf " [Output to ~a]\n" fn))
(printf " [Output to ~a]\n" fn)) (with-output-to-file fn #:exists 'truncate/replace
(with-output-to-file fn (lambda () (render-one d ri fn))))
#:exists 'truncate/replace
(lambda ()
(render-one d ri fn))))
ds ds
fns)) fns))
@ -335,10 +292,7 @@
(part-parts d)))) (part-parts d))))
(define/public (render-content c part ri) (define/public (render-content c part ri)
(apply append (apply append (map (lambda (i) (render-element i part ri)) c)))
(map (lambda (i)
(render-element i part ri))
c)))
(define/public (render-paragraph p part ri) (define/public (render-paragraph p part ri)
(render-content (paragraph-content p) part ri)) (render-content (paragraph-content p) part ri))
@ -364,9 +318,7 @@
null) null)
(define/public (render-table i part ri) (define/public (render-table i part ri)
(map (lambda (d) (if (flow? i) (map (lambda (d) (if (flow? i) (render-flow d part ri) null))
(render-flow d part ri)
null))
(apply append (table-flowss i)))) (apply append (table-flowss i))))
(define/public (render-itemization i part ri) (define/public (render-itemization i part ri)
@ -391,8 +343,7 @@
(render-content (delayed-element-content i ri) part ri)] (render-content (delayed-element-content i ri) part ri)]
[(part-relative-element? i) [(part-relative-element? i)
(render-content (part-relative-element-content i ri) part ri)] (render-content (part-relative-element-content i ri) part ri)]
[else [else (render-other i part ri)]))
(render-other i part ri)]))
(define/public (render-other i part ri) (define/public (render-other i part ri)
(list i)) (list i))
@ -403,10 +354,8 @@
(let ([src-dir (path-only fn)] (let ([src-dir (path-only fn)]
[dest-dir (get-dest-directory)] [dest-dir (get-dest-directory)]
[fn (file-name-from-path fn)]) [fn (file-name-from-path fn)])
(let ([src-file (build-path (or src-dir (current-directory)) (let ([src-file (build-path (or src-dir (current-directory)) fn)]
fn)] [dest-file (build-path (or dest-dir (current-directory)) fn)])
[dest-file (build-path (or dest-dir (current-directory))
fn)])
(unless (and (file-exists? dest-file) (unless (and (file-exists? dest-file)
(call-with-input-file* (call-with-input-file*
src-file src-file
@ -420,9 +369,7 @@
(let ([s (read-bytes 4096 src)] (let ([s (read-bytes 4096 src)]
[d (read-bytes 4096 dest)]) [d (read-bytes 4096 dest)])
(and (equal? s d) (and (equal? s d)
(if (eof-object? s) (or (eof-object? s) (loop)))))))))))
#t
(loop)))))))))))
(when (file-exists? dest-file) (delete-file dest-file)) (when (file-exists? dest-file) (delete-file dest-file))
(make-directory* (path-only dest-file)) (make-directory* (path-only dest-file))
(copy-file src-file dest-file)) (copy-file src-file dest-file))
@ -449,13 +396,13 @@
(do-table-of-contents part ri 1 (lambda (x) #t))) (do-table-of-contents part ri 1 (lambda (x) #t)))
(define/private (generate-toc part ri base-len skip? quiet) (define/private (generate-toc part ri base-len skip? quiet)
(let ([number (collected-info-number (part-collected-info part ri))]) (let* ([number (collected-info-number (part-collected-info part ri))]
(let ([subs [subs
(if (quiet (and (part-style? part 'quiet) (if (quiet (and (part-style? part 'quiet)
(not (= base-len (sub1 (length number)))))) (not (= base-len (sub1 (length number))))))
(apply (apply append (map (lambda (p)
append (generate-toc p ri base-len #f quiet))
(map (lambda (p) (generate-toc p ri base-len #f quiet)) (part-parts part))) (part-parts part)))
null)]) null)])
(if skip? (if skip?
subs subs
@ -464,25 +411,28 @@
(list (list
(make-paragraph (make-paragraph
(list (list
(make-element 'hspace (list (make-string (* 2 (- (length number) base-len)) #\space))) (make-element
(make-link-element (if (= 1 (length number)) 'hspace
"toptoclink" (list (make-string (* 2 (- (length number)
"toclink") base-len))
#\space)))
(make-link-element
(if (= 1 (length number)) "toptoclink" "toclink")
(append (append
(format-number number (format-number
(list number
(make-element 'hspace '(" ")))) (list (make-element 'hspace '(" "))))
(or (part-title-content part) '("???"))) (or (part-title-content part) '("???")))
(car (part-tags part)))))))) (car (part-tags part))))))))
subs)]) subs)])
(if (and (= 1 (length number)) (if (and (= 1 (length number))
(or (not (car number)) (or (not (car number)) ((car number) . > . 1)))
((car number) . > . 1))) (cons (list (make-flow
(cons (list (make-flow (list (make-paragraph (list (list (make-paragraph
(make-element 'hspace (list ""))))))) (list (make-element 'hspace (list "")))))))
l) l)
l)))))) l)))))
;; ---------------------------------------- ;; ----------------------------------------
(super-new)))) (super-new)))

1
collects/scribble/html-render.ss
View File

@ -507,6 +507,7 @@
[(centered) '((align "center"))] [(centered) '((align "center"))]
[(at-right) '((align "right"))] [(at-right) '((align "right"))]
[(at-left) '((align "left"))] [(at-left) '((align "left"))]
[(index) '((align "right"))]
[else null]) [else null])
,@(let ([a (and (list? (table-style t)) ,@(let ([a (and (list? (table-style t))
(assoc 'style (table-style t)))]) (assoc 'style (table-style t)))])