fix tab problem in text%

Merge to 5.2
This commit is contained in:
Matthew Flatt 2011-10-13 05:56:08 -06:00
parent 770c2d14f8
commit 5fb2f56fdf

View File

@ -702,7 +702,7 @@
[tabs null]) [tabs null])
(set-box! tabs (send admin get-tabs n space units?)) (set-box! tabs (send admin get-tabs n space units?))
(values n (values n
tabs ;; this should be a vector, right? tabs ;; a list
space space
(if units? (if units?
1 1
@ -714,12 +714,12 @@
(if (= i n) (if (= i n)
(let ([base (if (zero? n) (let ([base (if (zero? n)
0 0
(vector-ref tabs (- n 1)))]) (list-ref tabs (- n 1)))])
(let ([tabspace (* tabspace mult)]) (let ([tabspace (* tabspace mult)])
(+ base (- (->long tabspace) (+ base (- (->long tabspace)
(modulo (->long (- ex base)) (modulo (->long (- ex base))
(->long tabspace)))))) (->long tabspace))))))
(let ([v (vector-ref tabs i)]) (let ([v (list-ref tabs i)])
(if ((* mult v) . > . ex) (if ((* mult v) . > . ex)
(- (* mult v) ex) (- (* mult v) ex)
(loop (add1 i)))))))))) (loop (add1 i))))))))))