From 6d073e0cf70542e57b605108d9bda3760991daf9 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 19 Jul 2011 08:45:11 -0600 Subject: [PATCH] fix `get-slides-as-picts' to record margin with picts Closes PR 12059 --- collects/slideshow/slides-to-picts.rkt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/collects/slideshow/slides-to-picts.rkt b/collects/slideshow/slides-to-picts.rkt index acc1ae9ef1..8ac29afb03 100644 --- a/collects/slideshow/slides-to-picts.rkt +++ b/collects/slideshow/slides-to-picts.rkt @@ -42,10 +42,10 @@ (define commentary-on-slide? #f))] [((CORE : core^)) core@ CONFIG VIEWER] [((VIEWER : viewer^)) (unit - (import) + (import (prefix c: core^)) (export viewer^) (define (add-talk-slide! s) - (set! slides (cons s slides)) + (set! slides (cons (list s (c:get-margin)) slides)) (when (and stop-after ((length slides) . >= . stop-after)) (escape (void)))) @@ -59,17 +59,19 @@ (define enable-click-advance! void) (define set-page-numbers-visible! void) (define add-click-region! void) - (define done-making-slides void))])))) + (define done-making-slides void)) + CORE])))) (parameterize ([current-namespace ns]) (let/ec k (set! escape k) (dynamic-require `(file ,file) #f))) (map (lambda (s) - (let ([drawer (sliderec-drawer s)]) + (let ([drawer (sliderec-drawer (car s))] + [margin (cadr s)]) (dc (lambda (dc x y) (let-values ([(orig-xs orig-ys) (send dc get-scale)]) (send dc set-scale (* orig-xs xs) (* orig-ys ys)) - (drawer dc (+ (/ x xs) 20) (+ (/ y ys) 20)) + (drawer dc (+ (/ x xs) margin) (+ (/ y ys) margin)) (send dc set-scale orig-xs orig-ys))) w h 0 0))) (reverse slides))))))