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

fix and improve latex rendering

Browse Source 
svn: r6332

original commit: 574c9b5f7890f64a1c9ea2dc387f223b652ae457
This commit is contained in:
Matthew Flatt 2007-05-26 02:12:34 +00:00
parent 3ae117288c
commit 1c865ed71d
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,13 +24,14 @@
(andmap not number)) (andmap not number))
null null
(cons (cons
(apply (let ([s (apply
string-append string-append
(map (lambda (n) (map (lambda (n)
(if n (if n
(format "~s." n) (format "~s." n)
"")) ""))
(reverse number))) (reverse number)))])
(substring s 0 (sub1 (string-length s))))
sep))) sep)))
;; ---------------------------------------- ;; ----------------------------------------
@ -61,7 +62,7 @@
(when (part-title-content d) (when (part-title-content d)
(collect-content (part-title-content d) p-ht)) (collect-content (part-title-content d) p-ht))
(when (part-tag d) (when (part-tag d)
(collect-part-tag d p-ht)) (collect-part-tag d p-ht number))
(collect-flow (part-flow d) p-ht) (collect-flow (part-flow d) p-ht)
(let loop ([parts (part-parts d)] (let loop ([parts (part-parts d)]
[pos 1]) [pos 1])
@ -82,8 +83,8 @@
(lambda (k v) (lambda (k v)
(hash-table-put! ht k v))))) (hash-table-put! ht k v)))))
(define/public (collect-part-tag d ht) (define/public (collect-part-tag d ht number)
(hash-table-put! ht `(part ,(part-tag d)) (part-title-content d))) (hash-table-put! ht `(part ,(part-tag d)) (list (part-title-content d) number)))
(define/public (collect-content c ht) (define/public (collect-content c ht)
(for-each (lambda (i) (for-each (lambda (i)
@ -124,7 +125,7 @@
(element-content i)))) (element-content i))))
(define/public (collect-target-element i ht) (define/public (collect-target-element i ht)
(hash-table-put! ht (target-element-tag i) i)) (hash-table-put! ht (target-element-tag i) (list i)))
(define/public (collect-index-element i ht) (define/public (collect-index-element i ht)
(hash-table-put! ht `(index-entry ,(index-element-tag i)) (hash-table-put! ht `(index-entry ,(index-element-tag i))
@ -207,7 +208,7 @@
(null? (element-content i))) (null? (element-content i)))
(let ([v (lookup part ht (link-element-tag i))]) (let ([v (lookup part ht (link-element-tag i))])
(if v (if v
(render-content v part ht) (render-content (car v) part ht)
(render-content (list "[missing]") part ht)))] (render-content (list "[missing]") part ht)))]
[(element? i) [(element? i)
(render-content (element-content i) part ht)] (render-content (element-content i) part ht)]
@ -277,6 +278,7 @@
(append (append
(format-number number (format-number number
(list (list
"."
(make-element 'hspace '(" ")))) (make-element 'hspace '(" "))))
(part-title-content part)) (part-title-content part))
`(part ,(part-tag part)))))))) `(part ,(part-tag part))))))))

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

@ -48,7 +48,7 @@
(define/public (part-whole-page? d) (define/public (part-whole-page? d)
#f) #f)
(define/override (collect-part-tag d ht) (define/override (collect-part-tag d ht number)
(hash-table-put! ht (hash-table-put! ht
`(part ,(part-tag d)) `(part ,(part-tag d))
(list (current-output-file) (list (current-output-file)
@ -92,7 +92,7 @@
[(0) 'h2] [(0) 'h2]
[(1) 'h3] [(1) 'h3]
[else 'h4]) [else 'h4])
,@(format-number number '((tt nbsp))) ,@(format-number number '("." (tt nbsp)))
,@(if (part-tag d) ,@(if (part-tag d)
`((a ((name ,(format "~a" `(part ,(part-tag d))))))) `((a ((name ,(format "~a" `(part ,(part-tag d)))))))
null) null)

13
collects/scribble/latex-render.ss
View File

@ -15,7 +15,9 @@
(inherit render-flow (inherit render-flow
render-content render-content
install-file) install-file
format-number
lookup)
(define (define-color s s2) (define (define-color s s2)
(printf "\\newcommand{\\~a}[1]{{\\texttt{\\color{~a}{#1}}}}\n" s s2)) (printf "\\newcommand{\\~a}[1]{{\\texttt{\\color{~a}{#1}}}}\n" s s2))
@ -94,7 +96,14 @@
(pair? (link-element-tag e)) (pair? (link-element-tag e))
(eq? 'part (car (link-element-tag e))) (eq? 'part (car (link-element-tag e)))
(null? (element-content e))) (null? (element-content e)))
(printf "\\S\\ref{section:~a} " (cadr (link-element-tag e)))) (printf "\\S")
(render-content (let ([dest (lookup part ht (link-element-tag e))])
(if dest
(format-number (cadr dest) null)
(list "???")))
part
ht)
(printf " "))
(let ([style (and (element? e) (let ([style (and (element? e)
(element-style e))] (element-style e))]
[wrap (lambda (e s tt?) [wrap (lambda (e s tt?)