diff options
| author | Hugo Hörnquist <hugo@hornquist.se> | 2020-02-14 00:01:25 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@hornquist.se> | 2020-02-14 00:01:25 +0100 |
| commit | 029c2233e35a81e50154a1caedfe0041af9fb8b9 (patch) | |
| tree | 4dfff42d7a13f3238e820e2aff0e178894b764d7 /module/output | |
| parent | Fix date<%, similar to time<. (diff) | |
| download | calp-029c2233e35a81e50154a1caedfe0041af9fb8b9.tar.gz calp-029c2233e35a81e50154a1caedfe0041af9fb8b9.tar.xz | |
Fix event-length/day.
Diffstat (limited to 'module/output')
| -rw-r--r-- | module/output/html.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 4bb12b45..f30e6338 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -39,7 +39,7 @@ ;; Takes a list of vcomponents, sets their widths and x-positions to optimally ;; fill out the space, without any overlaps. -(define (fix-event-widths! start-of-day lst) +(define (fix-event-widths! date lst) ;; The tree construction is greedy. This means ;; that if a smaller event preceeds a longer ;; event it would capture the longer event to @@ -49,7 +49,8 @@ ;; @var{x} is how for left in the container we are. (let inner ((x 0) (tree (make-tree overlapping? - (sort* lst time>? (lambda (e) (event-length/day e)))))) + (sort* lst time>? + (lambda (e) (event-length/day date e)))))) (unless (null? tree) (let ((w (/ (- 1 x) (+ 1 (length-of-longst-branch (left-subtree tree)))))) @@ -89,7 +90,7 @@ 0) ;; height - (* 100/24 (time->decimal-hour (event-length/day ev))))) + (* 100/24 (time->decimal-hour (event-length/day date ev))))) `(a (@ (href "#" ,(UID ev)) (class "hidelink")) @@ -126,8 +127,8 @@ (format (current-error-port) "long=~a, short=~a~%" (length long-events) (length short-events)) - (fix-event-widths! time-obj short-events) - (fix-event-widths! time-obj long-events) + (fix-event-widths! date short-events) + (fix-event-widths! date long-events) `(div (@ (class "day")) (div (@ (class "meta")) ,(let ((str (date-link date))) |