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

Scribble fixes (PRs 10069, 10070)

Browse Source 
svn: r13553

original commit: 901cd24d4fc98817252fea7108116be155fb27d9
This commit is contained in:
Matthew Flatt 2009-02-13 21:17:03 +00:00
commit 0700b413cb
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collects/scribble/scheme.ss
View File

@ -377,7 +377,9 @@
[(and (pair? (syntax-e c)) [(and (pair? (syntax-e c))
(memq (syntax-e (car (syntax-e c))) (memq (syntax-e (car (syntax-e c)))
'(quote quasiquote unquote unquote-splicing '(quote quasiquote unquote unquote-splicing
quasisyntax syntax unsyntax unsyntax-splicing))) quasisyntax syntax unsyntax unsyntax-splicing))
(let ([v (syntax->list c)])
(and v (= 2 (length v)))))
(advance c init-line!) (advance c init-line!)
(let-values ([(str quote-delta) (let-values ([(str quote-delta)
(case (syntax-e (car (syntax-e c))) (case (syntax-e (car (syntax-e c)))
@ -464,8 +466,10 @@
(cond (cond
[(and (syntax? l) [(and (syntax? l)
(pair? (syntax-e l)) (pair? (syntax-e l))
(not (memq (syntax-e (car (syntax-e l))) (not (and (memq (syntax-e (car (syntax-e l)))
'(quote unquote syntax unsyntax quasiquote quasiunsyntax)))) '(quote unquote syntax unsyntax quasiquote quasiunsyntax))
(let ([v (syntax->list l)])
(and v (= 2 (length v)))))))
(lloop (syntax-e l))] (lloop (syntax-e l))]
[(or (null? l) [(or (null? l)
(and (syntax? l) (and (syntax? l)

10
collects/scribble/text-render.ss
View File

@ -6,7 +6,8 @@
(define (render-mixin %) (define (render-mixin %)
(class % (class %
(init [style-file #f]) (init [style-file #f]
[style-extra-files ()])
(define/override (get-substitutions) (define/override (get-substitutions)
'((#rx"---" "\U2014") '((#rx"---" "\U2014")
@ -62,10 +63,10 @@
null null
(apply (apply
append append
(map (lambda (d) (render-flow d part ht #f)) (car flowss)) (map (lambda (d) (unless (eq? d 'cont) (render-flow d part ht #f))) (car flowss))
(map (lambda (flows) (map (lambda (flows)
(newline) (newline)
(map (lambda (d) (render-flow d part ht #f)) flows)) (map (lambda (d) (unless (eq? d 'cont) (render-flow d part ht #f))) flows))
(cdr flowss)))))) (cdr flowss))))))
(define/override (render-itemization i part ht) (define/override (render-itemization i part ht)
@ -94,6 +95,9 @@
[(rang) "<"] [(rang) "<"]
[(rarr) "->"] [(rarr) "->"]
[(nbsp) " "] [(nbsp) " "]
[(prime) "'"]
[(alpha) "\u03B1"]
[(infin) "\u221E"]
[else (error 'text-render "unknown element symbol: ~e" i)]))] [else (error 'text-render "unknown element symbol: ~e" i)]))]
[(string? i) (display i)] [(string? i) (display i)]
[else (write i)]) [else (write i)])