diff --git a/collects/scheme/package.ss b/collects/scheme/package.ss index 569f493c00..21fd108310 100644 --- a/collects/scheme/package.ss +++ b/collects/scheme/package.ss @@ -16,7 +16,8 @@ define*-syntaxes (for-syntax package? - package-exported-identifiers)) + package-exported-identifiers + package-original-identifiers)) (define-for-syntax (do-define-* stx define-values-id) (syntax-case stx () @@ -404,5 +405,15 @@ (raise-type-error 'package-exported-identifiers "identifier bound to a package" id)) (let ([introduce (syntax-local-make-delta-introducer (syntax-local-introduce id))]) - (map (lambda (v) (syntax-local-introduce (cdr v))) + (map (lambda (i) + (syntax-local-introduce + (syntax-local-get-shadower + (introduce (car i))))) ((package-exports v)))))) + +(define-for-syntax (package-original-identifiers id) + (let ([v (and (identifier? id) + (syntax-local-value id (lambda () #f)))]) + (unless (package? v) + (raise-type-error 'package-exported-identifiers "identifier bound to a package" id)) + (map cdr ((package-exports v))))) diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss index 7cc500a250..d140e03e62 100644 --- a/collects/scribble/html-render.ss +++ b/collects/scribble/html-render.ss @@ -110,6 +110,11 @@ (with-attributes-assoc raw-style)) null)) +(define (pdf-to-png p) + (if (equal? (filename-extension p) #"pdf") + (path-replace-suffix p #".png") + p)) + #; ; no need for these index-local searches #reader scribble/reader (begin ; easier to format @@ -1002,7 +1007,7 @@ `([width ,(to-num (read-bytes 4 in))] [height ,(to-num (read-bytes 4 in))]) null))))]) - `((img ([src ,(let ([p (install-file src)]) + `((img ([src ,(let ([p (install-file (pdf-to-png src))]) (if (path? p) (url->string (path->url (path->complete-path p))) p))] diff --git a/collects/scribble/scribble.tex b/collects/scribble/scribble.tex index deffa722e8..54d304a7a8 100644 --- a/collects/scribble/scribble.tex +++ b/collects/scribble/scribble.tex @@ -1,4 +1,4 @@ -% This is the default prefix for Scribble-generated HTML +% This is the default prefix for Scribble-generated Latex \documentclass{article} diff --git a/collects/scribblings/quick/images/exprs.dat b/collects/scribblings/quick/images/exprs.dat index b4b4c8f96e..4c189599e6 100644 --- a/collects/scribblings/quick/images/exprs.dat +++ b/collects/scribblings/quick/images/exprs.dat @@ -3,75 +3,75 @@ ((1) 0 () 0 () () (c begin c "art gallery")) ((1) 0 () 0 () () "art gallery") ((1) 0 () 0 () () (c circle c 10)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img0.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img0.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c rectangle c 10 c 20)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img1.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img1.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c circle c 10 c 20)) -((1) 1 (((lib "exn.ss" "scribblings" "quick") . deserialize-info:mr-exn-v0)) 0 () () (0 "procedure circle: expects 1 argument, given 2: 10 20")) +((1) 1 (((lib "scribblings/quick/exn.ss") . deserialize-info:mr-exn-v0)) 0 () () (0 "procedure circle: expects 1 argument, given 2: 10 20")) ((1) 0 () 0 () () (c hc-append c (c circle c 10) c (c rectangle c 10 c 20))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img2.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img2.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c c c (c circle c 10))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c define c r c (c rectangle c 10 c 20))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () r) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img3.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img3.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c hc-append c c c r)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img4.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img4.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c hc-append c 20 c c c r c c)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img5.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img5.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c square c n) c (c filled-rectangle c n c n))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c square c 10)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img6.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img6.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c four c p) c (c define c two-p c (c hc-append c p c p)) c (c vc-append c two-p c two-p))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c four c (c circle c 10))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img7.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img7.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c checker c p1 c p2) c (c let c (c (c p12 c (c hc-append c p1 c p2)) c (c p21 c (c hc-append c p2 c p1))) c (c vc-append c p12 c p21)))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c checker c (c colorize c (c square c 10) c "red") c (c colorize c (c square c 10) c "black"))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img8.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img8.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c checkerboard c p) c (c let* c (c (c rp c (c colorize c p c "red")) c (c bp c (c colorize c p c "black")) c (c c c (c checker c rp c bp)) c (c c4 c (c four c c))) c (c four c c4)))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c checkerboard c (c square c 10))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img9.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img9.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () circle) -((1) 1 (((lib "struct.ss" "scribble") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#")))) +((1) 1 (((lib "scribble/struct.ss") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#")))) ((1) 0 () 0 () () (c define c (c series c mk) c (c hc-append c 4 c (c mk c 5) c (c mk c 10) c (c mk c 20)))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c series c circle)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img10.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img10.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c series c square)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img11.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img11.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c series c (c lambda c (c size) c (c checkerboard c (c square c size))))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img12.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img12.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c rgb-series c mk) c (c vc-append c (c series c (c lambda c (c sz) c (c colorize c (c mk c sz) c "red"))) c (c series c (c lambda c (c sz) c (c colorize c (c mk c sz) c "green"))) c (c series c (c lambda c (c sz) c (c colorize c (c mk c sz) c "blue")))))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c rgb-series c circle)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img13.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img13.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c rgb-series c square)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img14.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img14.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define c (c rgb-maker c mk) c (c lambda c (c sz) c (c vc-append c (c colorize c (c mk c sz) c "red") c (c colorize c (c mk c sz) c "green") c (c colorize c (c mk c sz) c "blue"))))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c series c (c rgb-maker c circle))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img15.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img15.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c series c (c rgb-maker c square))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img16.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img16.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c list c "red" c "green" c "blue")) ((1) 0 () 0 () () (c "red" c "green" c "blue")) ((1) 0 () 0 () () (c list c (c circle c 10) c (c square c 10))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 1 ("[image]") () (c (0 #f (c (0 (1 (u . "images/img17.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img18.png") 1.0) (c (? . 0))))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 1 ("[image]") () (c (0 #f (c (0 (1 (p+ #"images/img17.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img18.pdf" . unix) 1.0) (c (? . 0))))))) ((1) 0 () 0 () () (c define c (c rainbow c p) c (c map c (c lambda c (c color) c (c colorize c p c color)) c (c list c "red" c "orange" c "yellow" c "green" c "blue" c "purple")))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c rainbow c (c square c 5))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 1 ("[image]") () (c (0 #f (c (0 (1 (u . "images/img19.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img20.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img21.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img22.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img23.png") 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (u . "images/img24.png") 1.0) (c (? . 0))))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 1 ("[image]") () (c (0 #f (c (0 (1 (p+ #"images/img19.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img20.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img21.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img22.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img23.pdf" . unix) 1.0) (c (? . 0))))) c (0 #f (c (0 (1 (p+ #"images/img24.pdf" . unix) 1.0) (c (? . 0))))))) ((1) 0 () 0 () () (c apply c vc-append c (c rainbow c (c square c 5)))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img25.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img25.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c require c slideshow/flash)) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c filled-flash c 40 c 30)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img26.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img26.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c require c (c planet c "random.ss" c (c "schematics" c "random.plt" c 1 c 0)))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c random-gaussian)) @@ -79,11 +79,11 @@ ((1) 0 () 0 () () (c require c slideshow/code)) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c code c (c circle c 10))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img27.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img27.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c define-syntax c pict+code c (c syntax-rules c () c (c (c pict+code c expr) c (c hc-append c 10 c expr c (c code c expr)))))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c pict+code c (c circle c 10))) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img28.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img28.pdf" . unix) 1.0) (c "[image]"))))) ((1) 0 () 0 () () (c require c scheme/class c scheme/gui/base)) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c define c f c (c new c frame% c (c label c "My Art") c (c width c 300) c (c height c 300) c (c alignment c (c quote c (c center c center)))))) @@ -95,8 +95,8 @@ ((1) 0 () 0 () () (c define c (c add-drawing c p) c (c let c (c (c drawer c (c make-pict-drawer c p))) c (c new c canvas% c (c parent c f) c (c style c (c quote c (c border))) c (c paint-callback c (c lambda c (c self c dc) c (c drawer c dc c 0 c 0))))))) ((1) 0 () 0 () () (void)) ((1) 0 () 0 () () (c add-drawing c (c pict+code c (c circle c 10)))) -((1) 1 (((lib "struct.ss" "scribble") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)")))) +((1) 1 (((lib "scribble/struct.ss") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)")))) ((1) 0 () 0 () () (c add-drawing c (c colorize c (c filled-flash c 50 c 30) c "yellow"))) -((1) 1 (((lib "struct.ss" "scribble") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)")))) +((1) 1 (((lib "scribble/struct.ss") . deserialize-info:element-v0)) 0 () () (0 #f (c (u . "#(struct:object:canvas% ...)")))) ((1) 0 () 0 () () (c scale c (c bitmap c (c build-path c (c collection-path c "scribblings/quick") c "art.png")) c 0.5)) -((1) 2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (u . "images/img29.png") 1.0) (c "[image]"))))) +((1) 2 (((lib "scribble/struct.ss") . deserialize-info:element-v0) ((lib "scribble/struct.ss") . deserialize-info:image-file-v0)) 0 () () (0 #f (c (0 (1 (p+ #"images/img29.pdf" . unix) 1.0) (c "[image]"))))) diff --git a/collects/scribblings/quick/images/img0.pdf b/collects/scribblings/quick/images/img0.pdf new file mode 100644 index 0000000000..beff370cc2 Binary files /dev/null and b/collects/scribblings/quick/images/img0.pdf differ diff --git a/collects/scribblings/quick/images/img1.pdf b/collects/scribblings/quick/images/img1.pdf new file mode 100644 index 0000000000..5c70242db3 Binary files /dev/null and b/collects/scribblings/quick/images/img1.pdf differ diff --git a/collects/scribblings/quick/images/img10.pdf b/collects/scribblings/quick/images/img10.pdf new file mode 100644 index 0000000000..077d341243 --- /dev/null +++ b/collects/scribblings/quick/images/img10.pdf @@ -0,0 +1,80 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +xEKn1D8fiQ~(ӣy?,IYz7%?RE\U~@QgMKe'u:eQ?lS(b0?Ob%:#(- c͞dR5H4; l<)4<9mN:acd=\RD:LGd"*j^h<. tW!R:endstream +endobj +6 0 obj +214 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000506 00000 n +0000002090 00000 n +0000000447 00000 n +0000000318 00000 n +0000000015 00000 n +0000000299 00000 n +0000000570 00000 n +0000000611 00000 n +0000000640 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [] +>> +startxref +2278 +%%EOF diff --git a/collects/scribblings/quick/images/img11.pdf b/collects/scribblings/quick/images/img11.pdf new file mode 100644 index 0000000000..10868b4f77 Binary files /dev/null and b/collects/scribblings/quick/images/img11.pdf differ diff --git a/collects/scribblings/quick/images/img12.pdf b/collects/scribblings/quick/images/img12.pdf new file mode 100644 index 0000000000..497a8f0ca5 Binary files /dev/null and b/collects/scribblings/quick/images/img12.pdf differ diff --git a/collects/scribblings/quick/images/img13.pdf b/collects/scribblings/quick/images/img13.pdf new file mode 100644 index 0000000000..c64aca851c Binary files /dev/null and b/collects/scribblings/quick/images/img13.pdf differ diff --git a/collects/scribblings/quick/images/img14.pdf b/collects/scribblings/quick/images/img14.pdf new file mode 100644 index 0000000000..81007a2929 --- /dev/null +++ b/collects/scribblings/quick/images/img14.pdf @@ -0,0 +1,80 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +xm1 Ew'hl Tp*TCӡ/6a0B|{#]Iq_0, OI+> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000443 00000 n +0000002027 00000 n +0000000384 00000 n +0000000255 00000 n +0000000015 00000 n +0000000236 00000 n +0000000507 00000 n +0000000548 00000 n +0000000577 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [] +>> +startxref +2215 +%%EOF diff --git a/collects/scribblings/quick/images/img15.pdf b/collects/scribblings/quick/images/img15.pdf new file mode 100644 index 0000000000..a1d8495558 Binary files /dev/null and b/collects/scribblings/quick/images/img15.pdf differ diff --git a/collects/scribblings/quick/images/img16.pdf b/collects/scribblings/quick/images/img16.pdf new file mode 100644 index 0000000000..74db5eb3b3 --- /dev/null +++ b/collects/scribblings/quick/images/img16.pdf @@ -0,0 +1,80 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +xmQ @{@[c70qKLp~x}[ʺחҎtqzCycopгGO~*gs9ʲ9J ,YGM"ZXQ'jGM!q_2r6J\KݠMҕYsW,}hendstream +endobj +6 0 obj +162 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000454 00000 n +0000002038 00000 n +0000000395 00000 n +0000000266 00000 n +0000000015 00000 n +0000000247 00000 n +0000000518 00000 n +0000000559 00000 n +0000000588 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [<69B6A830B23F42EA9BF1DDBF732CBB15><69B6A830B23F42EA9BF1DDBF732CBB15>] +>> +startxref +2226 +%%EOF diff --git a/collects/scribblings/quick/images/img17.pdf b/collects/scribblings/quick/images/img17.pdf new file mode 100644 index 0000000000..0c819fb7c9 Binary files /dev/null and b/collects/scribblings/quick/images/img17.pdf differ diff --git a/collects/scribblings/quick/images/img18.pdf b/collects/scribblings/quick/images/img18.pdf new file mode 100644 index 0000000000..3a7600cf5a Binary files /dev/null and b/collects/scribblings/quick/images/img18.pdf differ diff --git a/collects/scribblings/quick/images/img19.pdf b/collects/scribblings/quick/images/img19.pdf new file mode 100644 index 0000000000..3440feac20 Binary files /dev/null and b/collects/scribblings/quick/images/img19.pdf differ diff --git a/collects/scribblings/quick/images/img2.pdf b/collects/scribblings/quick/images/img2.pdf new file mode 100644 index 0000000000..74c52a3d6d --- /dev/null +++ b/collects/scribblings/quick/images/img2.pdf @@ -0,0 +1,82 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +x=MA0 ~ATcK_čjBB8}Ң$L +FuLۊ[(.>ilg1<(3h0wk꧜$ +2zBv_\ U$endstream +endobj +6 0 obj +120 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000412 00000 n +0000001996 00000 n +0000000353 00000 n +0000000224 00000 n +0000000015 00000 n +0000000205 00000 n +0000000476 00000 n +0000000517 00000 n +0000000546 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [] +>> +startxref +2184 +%%EOF diff --git a/collects/scribblings/quick/images/img20.pdf b/collects/scribblings/quick/images/img20.pdf new file mode 100644 index 0000000000..74c34dfdeb Binary files /dev/null and b/collects/scribblings/quick/images/img20.pdf differ diff --git a/collects/scribblings/quick/images/img21.pdf b/collects/scribblings/quick/images/img21.pdf new file mode 100644 index 0000000000..37a6d91828 Binary files /dev/null and b/collects/scribblings/quick/images/img21.pdf differ diff --git a/collects/scribblings/quick/images/img22.pdf b/collects/scribblings/quick/images/img22.pdf new file mode 100644 index 0000000000..35dd60ffb0 Binary files /dev/null and b/collects/scribblings/quick/images/img22.pdf differ diff --git a/collects/scribblings/quick/images/img23.pdf b/collects/scribblings/quick/images/img23.pdf new file mode 100644 index 0000000000..f7d0dc6cb9 Binary files /dev/null and b/collects/scribblings/quick/images/img23.pdf differ diff --git a/collects/scribblings/quick/images/img24.pdf b/collects/scribblings/quick/images/img24.pdf new file mode 100644 index 0000000000..20529b0651 Binary files /dev/null and b/collects/scribblings/quick/images/img24.pdf differ diff --git a/collects/scribblings/quick/images/img25.pdf b/collects/scribblings/quick/images/img25.pdf new file mode 100644 index 0000000000..279cd23403 --- /dev/null +++ b/collects/scribblings/quick/images/img25.pdf @@ -0,0 +1,81 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +xuM +0Fs 8=НD 뛙 })~zy@7.!#^V.%˼ԶfM"Wi\ Tܠ21cytE!42B#3AZIlJi|Nendstream +endobj +6 0 obj +152 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000443 00000 n +0000002027 00000 n +0000000384 00000 n +0000000256 00000 n +0000000015 00000 n +0000000237 00000 n +0000000507 00000 n +0000000548 00000 n +0000000577 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [<75604C19F8497283D7E44AF2FE91D00A><75604C19F8497283D7E44AF2FE91D00A>] +>> +startxref +2215 +%%EOF diff --git a/collects/scribblings/quick/images/img26.pdf b/collects/scribblings/quick/images/img26.pdf new file mode 100644 index 0000000000..186787dba1 --- /dev/null +++ b/collects/scribblings/quick/images/img26.pdf @@ -0,0 +1,80 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +x퐽 1 {O؉MD1@!EQ|~~7d|ӀQH"^! Jg/l$UAMhK$2P㷆KРGHf 4v酙:L1ZڛdӮ_,rfJM T\u+jCW5>Apx-'^؎{endstream +endobj +6 0 obj +196 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000488 00000 n +0000002072 00000 n +0000000429 00000 n +0000000300 00000 n +0000000015 00000 n +0000000281 00000 n +0000000552 00000 n +0000000593 00000 n +0000000622 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [<694B7C614AF7EA90FCDB118411A69C86><694B7C614AF7EA90FCDB118411A69C86>] +>> +startxref +2260 +%%EOF diff --git a/collects/scribblings/quick/images/img27.pdf b/collects/scribblings/quick/images/img27.pdf new file mode 100644 index 0000000000..f46ee985a5 Binary files /dev/null and b/collects/scribblings/quick/images/img27.pdf differ diff --git a/collects/scribblings/quick/images/img28.pdf b/collects/scribblings/quick/images/img28.pdf new file mode 100644 index 0000000000..d0991d81a4 Binary files /dev/null and b/collects/scribblings/quick/images/img28.pdf differ diff --git a/collects/scribblings/quick/images/img29.pdf b/collects/scribblings/quick/images/img29.pdf new file mode 100644 index 0000000000..8451f2874b Binary files /dev/null and b/collects/scribblings/quick/images/img29.pdf differ diff --git a/collects/scribblings/quick/images/img3.pdf b/collects/scribblings/quick/images/img3.pdf new file mode 100644 index 0000000000..8daf9223a2 Binary files /dev/null and b/collects/scribblings/quick/images/img3.pdf differ diff --git a/collects/scribblings/quick/images/img4.pdf b/collects/scribblings/quick/images/img4.pdf new file mode 100644 index 0000000000..9f1ad67277 --- /dev/null +++ b/collects/scribblings/quick/images/img4.pdf @@ -0,0 +1,82 @@ +%PDF-1.4 +%쏢 +5 0 obj +<> +stream +x=MA0 ~ATcK_čjBB8}Ң$L +FuLۊ[(.>ilg1<(3h0wk꧜$ +2zBv_\ U$endstream +endobj +6 0 obj +120 +endobj +4 0 obj +<> +/Contents 5 0 R +>> +endobj +3 0 obj +<< /Type /Pages /Kids [ +4 0 R +] /Count 1 +>> +endobj +1 0 obj +<> +endobj +7 0 obj +<>endobj +8 0 obj +<> +endobj +9 0 obj +<>stream + + + + + +PLT Scheme + +Untitledmflatt@Macintosh \(Matthew Flatt\) + + + + + +endstream +endobj +2 0 obj +<>endobj +xref +0 10 +0000000000 65535 f +0000000412 00000 n +0000001996 00000 n +0000000353 00000 n +0000000224 00000 n +0000000015 00000 n +0000000205 00000 n +0000000476 00000 n +0000000517 00000 n +0000000546 00000 n +trailer +<< /Size 10 /Root 1 0 R /Info 2 0 R +/ID [<3B906556814EFBD523E9061C020AD58D><3B906556814EFBD523E9061C020AD58D>] +>> +startxref +2184 +%%EOF diff --git a/collects/scribblings/quick/images/img5.pdf b/collects/scribblings/quick/images/img5.pdf new file mode 100644 index 0000000000..2c60618c19 Binary files /dev/null and b/collects/scribblings/quick/images/img5.pdf differ diff --git a/collects/scribblings/quick/images/img6.pdf b/collects/scribblings/quick/images/img6.pdf new file mode 100644 index 0000000000..6004020783 Binary files /dev/null and b/collects/scribblings/quick/images/img6.pdf differ diff --git a/collects/scribblings/quick/images/img7.pdf b/collects/scribblings/quick/images/img7.pdf new file mode 100644 index 0000000000..ca15e67d85 Binary files /dev/null and b/collects/scribblings/quick/images/img7.pdf differ diff --git a/collects/scribblings/quick/images/img8.pdf b/collects/scribblings/quick/images/img8.pdf new file mode 100644 index 0000000000..d3b8f9fa90 Binary files /dev/null and b/collects/scribblings/quick/images/img8.pdf differ diff --git a/collects/scribblings/quick/images/img9.pdf b/collects/scribblings/quick/images/img9.pdf new file mode 100644 index 0000000000..2cf63f4e19 Binary files /dev/null and b/collects/scribblings/quick/images/img9.pdf differ diff --git a/collects/scribblings/quick/mreval.ss b/collects/scribblings/quick/mreval.ss index bc7d3d852c..ab9eb9f56b 100644 --- a/collects/scribblings/quick/mreval.ss +++ b/collects/scribblings/quick/mreval.ss @@ -7,7 +7,8 @@ mzlib/file mzlib/runtime-path mzlib/serialize - scribblings/quick/exn) + scribblings/quick/exn + scheme/system) (define-syntax define-mr (syntax-rules () @@ -107,6 +108,17 @@ (let ([fn (build-string-path img-dir (format "img~a.png" image-counter))]) (set! image-counter (add1 image-counter)) + (let ([dc (let ([pss (make-object (mr-eval 'ps-setup%))]) + (send pss set-mode 'file) + (send pss set-file (path-replace-suffix fn #".ps")) + (parameterize ([(mr-eval 'current-ps-setup) pss]) + (make-object (mr-eval 'post-script-dc%) #f)))]) + (send dc start-doc "Image") + (send dc start-page) + (((mr-eval 'make-pict-drawer) v) dc 0 0) + (send dc end-page) + (send dc end-doc) + (system (format "epstopdf ~a" (path-replace-suffix fn #".ps")))) (let* ([bm (make-object (mr-eval 'bitmap%) (inexact->exact (ceiling ((mr-eval 'pict-width) v))) (inexact->exact (ceiling ((mr-eval 'pict-height) v))))] @@ -115,7 +127,11 @@ (send dc clear) (((mr-eval 'make-pict-drawer) v) dc 0 0) (send bm save-file fn 'png) - (make-element #f (list (make-element (make-image-file fn 1.0) (list "[image]"))))))] + (make-element #f (list (make-element (make-image-file + ;; For HTML output, .pdf is automatically changed to .png: + (path-replace-suffix fn #".pdf") + 1.0) + (list "[image]"))))))] [(pair? v) (cons (fixup-picts (car v)) (fixup-picts (cdr v)))] [(serializable? v) v] diff --git a/collects/scribblings/reference/package.scrbl b/collects/scribblings/reference/package.scrbl index d6f7e3d150..fc966df479 100644 --- a/collects/scribblings/reference/package.scrbl +++ b/collects/scribblings/reference/package.scrbl @@ -124,11 +124,12 @@ cookies @deftogether[( @defproc[(package? [v any/c]) boolean?] @defproc[(package-exported-identifiers [id identifier?]) (listof identifier?)] +@defproc[(package-original-identifiers [id identifier?]) (listof identifier?)] )]{ -The @scheme[package?] and @scheme[package-exported-identifiers] -functions are exported @scheme[for-syntax] by -@schememodname[scheme/package]. +The @scheme[package?], @scheme[package-exported-identifiers], and +@scheme[package-original-identifiers] functions are exported +@scheme[for-syntax] by @schememodname[scheme/package]. The @scheme[package?] predicate returns @scheme[#t] if @scheme[v] is a package value as obtained by @scheme[syntax-local-value] on an @@ -136,8 +137,10 @@ identifier that is bound to a package. Given such an identifier, the @scheme[package-exported-identifiers] function returns a list of identifiers that corresponding to the -bindings that would be introduced by opening the package in the the -lexical context being expanded.} +bindings that would be introduced by opening the package in the +lexical context being expanded. The +@scheme[package-original-identifiers] function returns a parallel list +of identifiers for existing bindings of package's exports.} @; ---------------------------------------------------------------------- diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl index 63ce1757aa..f5d6556421 100644 --- a/collects/scribblings/scribble/struct.scrbl +++ b/collects/scribblings/scribble/struct.scrbl @@ -669,7 +669,11 @@ Used as a style for an @scheme[element] to inline an image. The @scheme[path->main-collects-relative]. For Latex output, a @filepath{.gif} suffix on @scheme[path] is -replaced with a @filepath{.png} suffix.} +replaced with a @filepath{.png} suffix (because animated GIFs can be +useful in HTML output, but Latex does not support GIFs). For HTML +output, a @filepath{.pdf} suffix on @scheme[path] is replaced with a +@filepath{.png} suffix (because PDF line drawings can be more +appropriate for Latex output, but HTML output needs bitmaps).} @defproc[(block? [v any/c]) boolean?]{