suzanne.soy/hyper-literate
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mostly cosmetics, very minor bug in index cleanup

Browse Source 
svn: r10004

original commit: 46528afa5bacfdbe1ac01c8659ba49d14e927dd3
This commit is contained in:
Eli Barzilay 2008-05-28 18:24:58 +00:00
parent ac120cf546
commit 2e2b73be67
6 changed files with 45 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,9 +165,7 @@
[(part tech cite) [(part tech cite)
(let ([rhs (cadr k)]) (let ([rhs (cadr k)])
(if (or (string? rhs) (pair? rhs)) (if (or (string? rhs) (pair? rhs))
(list (car k) (cons prefix (if (pair? rhs) (list (car k) (cons prefix (if (pair? rhs) rhs (list rhs))))
rhs
(list rhs))))
k))] k))]
[(index-entry) [(index-entry)
(let ([v (convert-key prefix (cadr k))]) (let ([v (convert-key prefix (cadr k))])
@ -177,8 +175,8 @@
(define/public (collect-part-tags d ci number) (define/public (collect-part-tags d ci number)
(for ([t (part-tags d)]) (for ([t (part-tags d)])
(hash-set! (collect-info-ht ci) (hash-set! (collect-info-ht ci)
(generate-tag t ci) (generate-tag t ci)
(list (or (part-title-content d) '("???")) number)))) (list (or (part-title-content d) '("???")) number))))
(define/public (collect-content c ci) (define/public (collect-content c ci)
(for ([i c]) (collect-element i ci))) (for ([i c]) (collect-element i ci)))
@ -191,12 +189,11 @@
(collect-block p ci))) (collect-block p ci)))
(define/public (collect-block p ci) (define/public (collect-block p ci)
(cond (cond [(table? p) (collect-table p ci)]
[(table? p) (collect-table p ci)] [(itemization? p) (collect-itemization p ci)]
[(itemization? p) (collect-itemization p ci)] [(blockquote? p) (collect-blockquote p ci)]
[(blockquote? p) (collect-blockquote p ci)] [(delayed-block? p) (void)]
[(delayed-block? p) (void)] [else (collect-paragraph p ci)]))
[else (collect-paragraph p ci)]))
(define/public (collect-table i ci) (define/public (collect-table i ci)
(for ([d (apply append (table-flowss i))]) (for ([d (apply append (table-flowss i))])
@ -212,24 +209,19 @@
(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-ref (collect-info-relatives ci) i #f)
(or (hash-ref (collect-info-relatives ci) i #f) (let ([v ((part-relative-element-collect i) ci)])
(let ([v ((part-relative-element-collect i) ci)]) (hash-set! (collect-info-relatives ci) i v)
(hash-set! (collect-info-relatives ci) i v) v))])
v))])
(collect-content content ci)) (collect-content content ci))
(begin (begin (when (target-element? i) (collect-target-element i ci))
(when (target-element? i) (collect-target-element i ci)) (when (index-element? i) (collect-index-element i ci))
(when (index-element? i) (collect-index-element i ci)) (when (collect-element? i) ((collect-element-collect i) ci))
(when (collect-element? i) ((collect-element-collect i) ci)) (when (element? i)
(when (element? i) (for ([e (element-content i)]) (collect-element e ci))))))
(for ([e (element-content i)])
(collect-element e ci))))))
(define/public (collect-target-element i ci) (define/public (collect-target-element i ci)
(collect-put! ci (collect-put! ci (generate-tag (target-element-tag i) ci) (list i)))
(generate-tag (target-element-tag i) ci)
(list i)))
(define/public (collect-index-element i ci) (define/public (collect-index-element i ci)
(collect-put! ci (collect-put! ci
@ -242,10 +234,7 @@
;; global-info resolution ;; global-info resolution
(define/public (resolve ds fns ci) (define/public (resolve ds fns ci)
(let ([ri (make-resolve-info ci (let ([ri (make-resolve-info ci (make-hasheq) (make-hash) (make-hash))])
(make-hasheq)
(make-hash)
(make-hash))])
(start-resolve ds fns ri) (start-resolve ds fns ri)
ri)) ri))

24
collects/scribble/basic.ss
View File

@ -4,8 +4,8 @@
(require "decode.ss" (require "decode.ss"
"struct.ss" "struct.ss"
"config.ss" "config.ss"
mzlib/list scheme/list
mzlib/class scheme/class
setup/main-collects setup/main-collects
syntax/modresolve syntax/modresolve
(for-syntax scheme/base)) (for-syntax scheme/base))
@ -25,7 +25,7 @@
(define (convert-tag tag content) (define (convert-tag tag content)
(if (list? tag) (if (list? tag)
(apply append (map (lambda (t) (convert-tag t content)) tag)) (append-map (lambda (t) (convert-tag t content)) tag)
`((part ,(or tag (gen-tag content)))))) `((part ,(or tag (gen-tag content))))))
(define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style #f] (define (title #:tag [tag #f] #:tag-prefix [prefix #f] #:style [style #f]
@ -176,21 +176,21 @@
(define (index* word-seq content-seq . s) (define (index* word-seq content-seq . s)
(let ([key (make-generated-tag)]) (let ([key (make-generated-tag)])
(record-index (map clean-up-index-string word-seq) content-seq key (decode-content s)))) (record-index (map clean-up-index-string word-seq)
content-seq key (decode-content s))))
(define (index word-seq . s) (define (index word-seq . s)
(let ([word-seq (if (string? word-seq) (list word-seq) word-seq)]) (let ([word-seq (if (string? word-seq) (list word-seq) word-seq)])
(apply index* (map clean-up-index-string word-seq) word-seq s))) (apply index* word-seq word-seq s)))
(define (as-index . s) (define (as-index . s)
(let ([key (make-generated-tag)] (let ([key (make-generated-tag)]
[content (decode-content s)]) [content (decode-content s)])
(record-index (list (clean-up-index-string (content->string content))) (record-index
(if (= 1 (length content)) (list (clean-up-index-string (content->string content)))
content (if (= 1 (length content)) content (list (make-element #f content)))
(list (make-element #f content))) key
key content)))
content)))
(define (index-section #:title [title "Index"] #:tag [tag #f]) (define (index-section #:title [title "Index"] #:tag [tag #f])
(make-unnumbered-part #f (make-unnumbered-part #f
@ -205,7 +205,7 @@
(define (commas l) (define (commas l)
(if (or (null? l) (null? (cdr l))) (if (or (null? l) (null? (cdr l)))
l l
(cdr (apply append (map (lambda (i) (list ", " i)) l))))) (cdr (append-map (lambda (i) (list ", " i)) l))))
(define (cadr-string-lists<? a b) (define (cadr-string-lists<? a b)
(let loop ([a (cadr a)] [b (cadr b)]) (let loop ([a (cadr a)] [b (cadr b)])
(cond [(null? b) #f] (cond [(null? b) #f]

22
collects/scribble/decode.ss
View File

@ -33,16 +33,13 @@
[part-tag-decl ([tag tag?])]) [part-tag-decl ([tag tag?])])
(define (clean-up-index-string s) (define (clean-up-index-string s)
;; Remove leading spaces or trailing, which might appear there due ;; Collapse whitespace, and remove leading or trailing spaces, which
;; to images or something else that gets dropped in string form. ;; might appear there due to images or something else that gets
;; Then collapse whitespace. ;; dropped in string form.
(regexp-replace* #px"\\s+" (let* ([s (regexp-replace* #px"\\s+" s " ")]
(regexp-replace #rx"^ +" [s (regexp-replace* #rx"^ " s "")]
(regexp-replace #rx" +$" [s (regexp-replace* #rx" $" s "")])
s s))
"")
"")
" "))
(define (decode-string s) (define (decode-string s)
(let loop ([l '((#rx"---" mdash) (let loop ([l '((#rx"---" mdash)
@ -102,9 +99,8 @@
(cons (make-index-element (cons (make-index-element
#f null (car tags) #f null (car tags)
(list (clean-up-index-string (list (clean-up-index-string
(regexp-replace (regexp-replace #px"^\\s+(?:(?:A|An|The)\\s)?"
#px"^\\s+(?:(?:A|An|The)\\s)?" (content->string title) "")))
(content->string title) "")))
(list (make-element #f title)) (list (make-element #f title))
(make-part-index-desc)) (make-part-index-desc))
l) l)

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

@ -872,7 +872,7 @@
(define/override (render-table t part ri need-inline?) (define/override (render-table t part ri need-inline?)
(define t-style (table-style t)) (define t-style (table-style t))
(define t-style-get (if (and (pair? t-style) (list? t-style)) (define t-style-get (if (and (pair? t-style) (list? t-style))
(lambda (k) (assoc k (or t-style null))) (lambda (k) (assoc k t-style))
(lambda (k) #f))) (lambda (k) #f)))
(define index? (eq? 'index t-style)) (define index? (eq? 'index t-style))
(define (make-row flows style) (define (make-row flows style)

5
collects/scribble/manual-struct.ss
View File

@ -6,7 +6,7 @@
(provide-structs (provide-structs
[module-path-index-desc ()] [module-path-index-desc ()]
[exported-index-desc ([name symbol?] [exported-index-desc ([name symbol?]
[from-libs (listof module-path?)])] [from-libs (listof module-path?)])]
[(method-index-desc exported-index-desc) ([method-name symbol?] [(method-index-desc exported-index-desc) ([method-name symbol?]
[class-tag tag?])] [class-tag tag?])]
[(procedure-index-desc exported-index-desc) ()] [(procedure-index-desc exported-index-desc) ()]
@ -16,6 +16,3 @@
[(class-index-desc exported-index-desc) ()] [(class-index-desc exported-index-desc) ()]
[(interface-index-desc exported-index-desc) ()] [(interface-index-desc exported-index-desc) ()]
[(mixin-index-desc exported-index-desc) ()]) [(mixin-index-desc exported-index-desc) ()])

3
collects/scribble/manual.ss
View File

@ -303,7 +303,8 @@
(define (indexed-file . str) (define (indexed-file . str)
(let* ([f (apply filepath str)] (let* ([f (apply filepath str)]
[s (element->string f)]) [s (element->string f)])
(index* (list (clean-up-index-string (substring s 1 (sub1 (string-length s))))) (index* (list (clean-up-index-string
(substring s 1 (sub1 (string-length s)))))
(list f) (list f)
f))) f)))
(define (exec . str) (define (exec . str)