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

work on guide, and fix problems with scribble/eval

Browse Source 
svn: r8250

original commit: 343308481a82f6999e3d84842babdfd471a3af93
This commit is contained in:
Matthew Flatt 2008-01-07 21:47:22 +00:00
parent c274ee270d
commit ee106049e2
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
collects/scribble/eval.ss
View File

@ -193,7 +193,7 @@
[comment? (lambda (a) [comment? (lambda (a)
(and (pair? a) (and (pair? a)
(or (eq? (car a) 'code:comment) (or (eq? (car a) 'code:comment)
(and (identifier? a) (and (identifier? (car a))
(eq? (syntax-e (car a)) 'code:comment)))))]) (eq? (syntax-e (car a)) 'code:comment)))))])
(if (or (comment? a) (if (or (comment? a)
(and (syntax? a) (comment? (syntax-e a)))) (and (syntax? a) (comment? (syntax-e a))))
@ -217,12 +217,15 @@
ev ev
catching-exns? catching-exns?
(let ([s (strip-comments s)]) (let ([s (strip-comments s)])
(if (syntax? s) (cond
(syntax-case s (module) [(syntax? s)
[(module . _rest) (syntax-case s (module)
(syntax->datum s)] [(module . _rest)
[_else s]) (syntax->datum s)]
s)))) [_else s])]
[(string? s)
`(begin ,s)]
[else s]))))
list)) list))
(define-syntax-rule (quote-expr e) 'e) (define-syntax-rule (quote-expr e) 'e)
@ -262,9 +265,7 @@
(list " "))) (list " ")))
(define-syntax (schemedefinput* stx) (define-syntax (schemedefinput* stx)
(syntax-case stx (eval-example-string define define-values define-struct) (syntax-case stx (define define-values define-struct)
[(_ (eval-example-string s))
#'(schemeinput* (eval-example-string s))]
[(_ (define . rest)) [(_ (define . rest))
(syntax-case stx () (syntax-case stx ()
[(_ e) #'(schemeblock+line e)])] [(_ e) #'(schemeblock+line e)])]

28
collects/scribble/manual.ss
View File

@ -1861,26 +1861,28 @@
#f #f
(append (append
(if author (if author
(list author (append (decode-content (list author))
", ") (list ", "))
null) null)
(list 'ldquo (list 'ldquo)
title (decode-content (list title))
(if location (list (if location
"," ","
".") ".")
'rdquo) 'rdquo)
(if location (if location
(list " " (cons " "
location (append
(if date (decode-content (list location))
"," (list
".")) (if date
","
"."))))
null) null)
(if date (if date
(list " " (cons " "
date (append (decode-content (list date))
".") (list ".")))
null) null)
(if url (if url
(list " " (list " "