diff --git a/collects/scribblings/doc-installer.ss b/collects/scribblings/doc-installer.ss index b53e7e017b..fe1feb23a9 100644 --- a/collects/scribblings/doc-installer.ss +++ b/collects/scribblings/doc-installer.ss @@ -1,7 +1,8 @@ (module doc-installer mzscheme (require (lib "dirs.ss" "setup") (prefix core: "core.ss") - (prefix quick: "quick.ss")) + (prefix quick: "quick.ss") + (prefix scribble: "scribble.ss")) (provide post-installer) @@ -10,4 +11,5 @@ (let ([doc (find-doc-dir)]) (when doc (core:build) - (quick:build)))))) + (quick:build) + (scribble:build)))))) diff --git a/collects/scribblings/quick/images/exprs.dat b/collects/scribblings/quick/images/exprs.dat index 16719cab09..89d1b6c103 100644 --- a/collects/scribblings/quick/images/exprs.dat +++ b/collects/scribblings/quick/images/exprs.dat @@ -7,74 +7,74 @@ (0 () 0 () () "art gallery") (0 () 0 () () "art gallery") (0 () 0 () () (c! circle c! 10)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img0.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img0.png")) (c! "[image]"))))) (0 () 0 () () (c! rectangle c! 10 c! 20)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img1.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img1.png")) (c! "[image]"))))) (0 () 0 () () (c! circle c! 10 c! 20)) -(1 ((#"/Users/mflatt/proj/plt/collects/scribblings/quick/exn.ss" . deserialize-info:mr-exn-v0)) 0 () () (0 "procedure circle: expects 1 argument, given 2: 10 20")) +(1 (((lib "quick/exn.ss" "scribblings") . deserialize-info:mr-exn-v0)) 0 () () (0 "procedure circle: expects 1 argument, given 2: 10 20")) (0 () 0 () () (c! hc-append c! (c! circle c! 10) c! (c! rectangle c! 10 c! 20))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img2.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img2.png")) (c! "[image]"))))) (0 () 0 () () (c! define c! c c! (c! circle c! 10))) (0 () 0 () () (void)) (0 () 0 () () (c! define c! r c! (c! rectangle c! 10 c! 20))) (0 () 0 () () (void)) (0 () 0 () () r) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img3.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img3.png")) (c! "[image]"))))) (0 () 0 () () (c! hc-append c! c c! r)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img4.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img4.png")) (c! "[image]"))))) (0 () 0 () () (c! hc-append c! 20 c! c c! r c! c)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img5.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img5.png")) (c! "[image]"))))) (0 () 0 () () (c! define c! (c! square c! n) c! (c! filled-rectangle c! n c! n))) (0 () 0 () () (void)) (0 () 0 () () (c! square c! 10)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img6.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img6.png")) (c! "[image]"))))) (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))) (0 () 0 () () (void)) (0 () 0 () () (c! four c! (c! circle c! 10))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img7.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img7.png")) (c! "[image]"))))) (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)))) (0 () 0 () () (void)) (0 () 0 () () (c! checker c! (c! colorize c! (c! square c! 10) c! "red") c! (c! colorize c! (c! square c! 10) c! "black"))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img8.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img8.png")) (c! "[image]"))))) (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)))) (0 () 0 () () (void)) (0 () 0 () () (c! checkerboard c! (c! square c! 10))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img9.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img9.png")) (c! "[image]"))))) (0 () 0 () () circle) (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)))) (0 () 0 () () (void)) (0 () 0 () () (c! series c! circle)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img10.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img10.png")) (c! "[image]"))))) (0 () 0 () () (c! series c! square)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img11.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img11.png")) (c! "[image]"))))) (0 () 0 () () (c! series c! (c! lambda c! (c! size) c! (c! checkerboard c! (c! square c! size))))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img12.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img12.png")) (c! "[image]"))))) (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")))))) (0 () 0 () () (void)) (0 () 0 () () (c! rgb-series c! circle)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img13.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img13.png")) (c! "[image]"))))) (0 () 0 () () (c! rgb-series c! square)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img14.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img14.png")) (c! "[image]"))))) (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"))))) (0 () 0 () () (void)) (0 () 0 () () (c! series c! (c! rgb-maker c! circle))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img15.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img15.png")) (c! "[image]"))))) (0 () 0 () () (c! series c! (c! rgb-maker c! square))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img16.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img16.png")) (c! "[image]"))))) (0 () 0 () () (c! list c! "red" c! "green" c! "blue")) (0 () 0 () () (c! "red" c! "green" c! "blue")) (0 () 0 () () (c! list c! (c! circle c! 10) c! (c! square c! 10))) -(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 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img17.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img18.png" . unix)) (c! (? . 0))))))) +(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 . "quick/images/img17.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img18.png")) (c! (? . 0))))))) (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")))) (0 () 0 () () (void)) (0 () 0 () () (c! rainbow c! (c! square c! 5))) -(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 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img19.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img20.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img21.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img22.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img23.png" . unix)) (c! (? . 0))))) c! (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img24.png" . unix)) (c! (? . 0))))))) +(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 . "quick/images/img19.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img20.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img21.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img22.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img23.png")) (c! (? . 0))))) c! (0 #f (c! (0 (1 (u . "quick/images/img24.png")) (c! (? . 0))))))) (0 () 0 () () (c! apply c! vc-append c! (c! rainbow c! (c! square c! 5)))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img25.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img25.png")) (c! "[image]"))))) (0 () 0 () () (c! require c! (c! lib c! "flash.ss" c! "texpict"))) (0 () 0 () () (void)) (0 () 0 () () (c! filled-flash c! 40 c! 30)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img26.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img26.png")) (c! "[image]"))))) (0 () 0 () () (c! require c! (c! planet c! "random.ss" c! (c! "schematics" c! "random.plt" c! 1 c! 0)))) (0 () 0 () () (void)) (0 () 0 () () (c! random-gaussian)) @@ -82,11 +82,11 @@ (0 () 0 () () (c! require c! (c! lib c! "code.ss" c! "slideshow"))) (0 () 0 () () (void)) (0 () 0 () () (c! code c! (c! circle c! 10))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img27.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img27.png")) (c! "[image]"))))) (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)))))) (0 () 0 () () (void)) (0 () 0 () () (c! pict+code c! (c! circle c! 10))) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img28.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img28.png")) (c! "[image]"))))) (0 () 0 () () (c! require c! (c! lib c! "class.ss" c! "mzlib") c! (c! lib c! "mred.ss" c! "mred"))) (0 () 0 () () (void)) (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)))))) @@ -98,8 +98,8 @@ (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))))))) (0 () 0 () () (void)) (0 () 0 () () (c! add-drawing c! (c! pict+code c! (c! circle c! 10)))) -(1 ((#"/Users/mflatt/proj/plt/collects/scribblings/quick/exn.ss" . deserialize-info:object:canvas%-v0)) 0 () () (0)) +(1 (((lib "quick/exn.ss" "scribblings") . deserialize-info:object:canvas%-v0)) 0 () () (0)) (0 () 0 () () (c! add-drawing c! (c! colorize c! (c! filled-flash c! 50 c! 30) c! "yellow"))) -(1 ((#"/Users/mflatt/proj/plt/collects/scribblings/quick/exn.ss" . deserialize-info:object:canvas%-v0)) 0 () () (0)) +(1 (((lib "quick/exn.ss" "scribblings") . deserialize-info:object:canvas%-v0)) 0 () () (0)) (0 () 0 () () (c! scale c! (c! bitmap c! "quick/art.png") c! 0.5)) -(2 (((lib "struct.ss" "scribble") . deserialize-info:element-v0) ((lib "struct.ss" "scribble") . deserialize-info:image-file-v0)) 0 () () (0 #f (c! (0 (1 (p+ #"/Users/mflatt/proj/plt/collects/scribblings/quick/images/img29.png" . unix)) (c! "[image]"))))) +(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 . "quick/images/img29.png")) (c! "[image]"))))) diff --git a/collects/scribblings/quick/mreval.ss b/collects/scribblings/quick/mreval.ss index da536fe0f5..38a1a9245c 100644 --- a/collects/scribblings/quick/mreval.ss +++ b/collects/scribblings/quick/mreval.ss @@ -8,7 +8,7 @@ (lib "file.ss") (lib "runtime-path.ss") (lib "serialize.ss") - "exn.ss") + (lib "exn.ss" "scribblings" "quick")) (define-syntax define-mr (syntax-rules () @@ -32,8 +32,7 @@ (define mred? (getenv "MREVAL")) - (define-runtime-path img-dir "images") - (define-runtime-path exn-module "exn.ss") + (define img-dir "quick/images") ; relative to scribbles dir (define mr-eval-handler (if mred? @@ -87,13 +86,13 @@ (define mr-namespace (if mred? - (current-int-namespace ((dynamic-require '(lib "mred.ss" "mred") 'make-namespace-with-mred))) + ((dynamic-require '(lib "mred.ss" "mred") 'make-namespace-with-mred)) (let ([ns (make-namespace)]) (namespace-attach-module (current-namespace) '(lib "struct.ss" "scribble") ns) (namespace-attach-module (current-namespace) - exn-module + '(lib "exn.ss" "scribblings" "quick") ns) ns))) @@ -120,7 +119,7 @@ (define (fixup-picts v) (cond [((ss:pict?) v) - (let ([fn (build-path img-dir (format "img~a.png" image-counter))]) + (let ([fn (format "~a/img~a.png" img-dir image-counter)]) (set! image-counter (add1 image-counter)) (let* ([bm (make-object (mred:bitmap%) (inexact->exact (ceiling ((ss:pict-width) v))) diff --git a/collects/scribblings/scribble.ss b/collects/scribblings/scribble.ss new file mode 100644 index 0000000000..5a07e5b6a3 --- /dev/null +++ b/collects/scribblings/scribble.ss @@ -0,0 +1,11 @@ + +(module scribble mzscheme + (require "to-html.ss" + (prefix scribble: "scribble/scribble.scrbl")) + + (provide build) + + (define (build) + (to-html #t #f + (list scribble:doc ) + (list "scribble")))) diff --git a/collects/scribblings/scribble/basic.scrbl b/collects/scribblings/scribble/basic.scrbl index f89f269107..40f3f98127 100644 --- a/collects/scribblings/scribble/basic.scrbl +++ b/collects/scribblings/scribble/basic.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @require-for-syntax[mzscheme] diff --git a/collects/scribblings/scribble/decode.scrbl b/collects/scribblings/scribble/decode.scrbl index 1e8e2c8e12..3af9acb34a 100644 --- a/collects/scribblings/scribble/decode.scrbl +++ b/collects/scribblings/scribble/decode.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @title[#:tag "decode"]{Text Decoder} diff --git a/collects/scribblings/scribble/doclang.scrbl b/collects/scribblings/scribble/doclang.scrbl index 53ee0ed68b..9af8c51be5 100644 --- a/collects/scribblings/scribble/doclang.scrbl +++ b/collects/scribblings/scribble/doclang.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @title[#:tag "doclang"]{Document Module Languegs} diff --git a/collects/scribblings/scribble/docreader.scrbl b/collects/scribblings/scribble/docreader.scrbl index 3806481403..c5ccea2f91 100644 --- a/collects/scribblings/scribble/docreader.scrbl +++ b/collects/scribblings/scribble/docreader.scrbl @@ -1,6 +1,6 @@ -#reader"../docreader.ss" -@require["../manual.ss"] -@require["../bnf.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] +@require[(lib "bnf.ss" "scribble")] @require["utils.ss"] @title[#:tag "docreader"]{Document Reader} diff --git a/collects/scribblings/scribble/eval.scrbl b/collects/scribblings/scribble/eval.scrbl index 3feff19bbd..37ceb7897b 100644 --- a/collects/scribblings/scribble/eval.scrbl +++ b/collects/scribblings/scribble/eval.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @title[#:tag "eval"]{Evaluation and Examples} diff --git a/collects/scribblings/scribble/manual.scrbl b/collects/scribblings/scribble/manual.scrbl index 221fad0df5..29fb906145 100644 --- a/collects/scribblings/scribble/manual.scrbl +++ b/collects/scribblings/scribble/manual.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @require-for-syntax[mzscheme] diff --git a/collects/scribblings/scribble/reader.scrbl b/collects/scribblings/scribble/reader.scrbl index 4e1f570da9..7006d9652e 100644 --- a/collects/scribblings/scribble/reader.scrbl +++ b/collects/scribblings/scribble/reader.scrbl @@ -1,6 +1,6 @@ -#reader"../docreader.ss" -@require["../manual.ss"] -@require["../bnf.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] +@require[(lib "bnf.ss" "scribble")] @require["utils.ss"] @title[#:tag "reader"]{Scribble Reader} diff --git a/collects/scribblings/scribble/renderer.scrbl b/collects/scribblings/scribble/renderer.scrbl index 0d3a19fbc6..3a78f66fba 100644 --- a/collects/scribblings/scribble/renderer.scrbl +++ b/collects/scribblings/scribble/renderer.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @title[#:tag "renderer"]{Renderer} diff --git a/collects/scribblings/scribble/scribble.scrbl b/collects/scribblings/scribble/scribble.scrbl index 5eaab8545b..4f1ff2eb0b 100644 --- a/collects/scribblings/scribble/scribble.scrbl +++ b/collects/scribblings/scribble/scribble.scrbl @@ -1,6 +1,6 @@ -#reader"../docreader.ss" -@require["../manual.ss"] -@require["../bnf.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] +@require[(lib "bnf.ss" "scribble")] @require["utils.ss"] @title{PLT Scribble} diff --git a/collects/scribblings/scribble/struct.scrbl b/collects/scribblings/scribble/struct.scrbl index 9371830b5c..4a22cb21f1 100644 --- a/collects/scribblings/scribble/struct.scrbl +++ b/collects/scribblings/scribble/struct.scrbl @@ -1,5 +1,5 @@ -#reader"../docreader.ss" -@require["../manual.ss"] +#reader(lib "docreader.ss" "scribble") +@require[(lib "manual.ss" "scribble")] @require["utils.ss"] @title[#:tag "struct"]{Document Structures} diff --git a/collects/scribblings/scribble/utils.ss b/collects/scribblings/scribble/utils.ss index 15795a8264..a12444e141 100644 --- a/collects/scribblings/scribble/utils.ss +++ b/collects/scribblings/scribble/utils.ss @@ -1,9 +1,9 @@ (module utils mzscheme - (require "../struct.ss" - "../manual.ss" - (prefix scheme: "../scheme.ss") - (prefix scribble: "../reader.ss") + (require (lib "struct.ss" "scribble") + (lib "manual.ss" "scribble") + (prefix scheme: (lib "scheme.ss" "scribble")) + (prefix scribble: (lib "reader.ss" "scribble")) (lib "string.ss")) (provide at diff --git a/collects/scribblings/to-html.ss b/collects/scribblings/to-html.ss index 1bf576f769..10bfbd4d07 100644 --- a/collects/scribblings/to-html.ss +++ b/collects/scribblings/to-html.ss @@ -16,7 +16,8 @@ (build-path main-doc-dir (car names)))]) (unless multi? (make-directory* doc-dir)) - (parameterize ([current-directory doc-dir] + (parameterize ([current-directory dir] + [current-dest-directory doc-dir] [current-render-mixin (if multi? multi-html:render-mixin html:render-mixin)]