From 228d485e10f44b402843badabba4f09599f3c2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Tue, 5 May 2020 21:34:52 +0200
Subject: Change to only call get-datetime in parse.

---
 module/output/html.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/output/html.scm')

diff --git a/module/output/html.scm b/module/output/html.scm
index 3b17d81b..6dc9591b 100644
--- a/module/output/html.scm
+++ b/module/output/html.scm
@@ -234,12 +234,12 @@
 
   (make-block
    ev `((class
-          ,(when (date<? (as-date (get-datetime (attr ev 'DTSTART))) date)
+          ,(when (date<? (as-date (attr ev 'DTSTART)) date)
              " continued")
           ;; TODO all day events usually have the day after as DTEND.
           ;; So a whole day event the 6 june would have a DTEND of the
           ;; 7 june.
-          ,(when (date<? date (as-date (get-datetime (attr ev 'DTEND))))
+          ,(when (date<? date (as-date (attr ev 'DTEND)))
              " continuing"))
         (style ,style))))
 
-- 
cgit v1.2.3


From 1eadb9ad346e7326cea9b88ba92ecd24d672e400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Wed, 6 May 2020 12:43:28 +0200
Subject: Made benchmark main runnable again.

---
 module/output/html.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'module/output/html.scm')

diff --git a/module/output/html.scm b/module/output/html.scm
index 6dc9591b..31b57228 100644
--- a/module/output/html.scm
+++ b/module/output/html.scm
@@ -783,6 +783,8 @@
   (define calendars (getf 'calendars))
   (define events (getf 'event-set))
 
+  ((@ (util time) report-time!) "html start")
+
   ;; TODO This still doesn't account for PWD, file existing but is of
   ;; wrong type, html directory existing but static symlink missing,
   ;; static being a different file type, and probably something else
-- 
cgit v1.2.3


From c1feb55a2013116c3291cf0df26f9ab39ad3e8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Sat, 9 May 2020 21:43:16 +0200
Subject: New parser now on feature parity with old.

---
 module/output/html.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'module/output/html.scm')

diff --git a/module/output/html.scm b/module/output/html.scm
index 31b57228..da5c0659 100644
--- a/module/output/html.scm
+++ b/module/output/html.scm
@@ -145,12 +145,17 @@
 
              ,(fmt-single-event ev))))
 
+(define (->string a)
+  (format #f "~a" a))
+
 (define (data-attributes event)
   (hash-map->list
    (match-lambda*
+     [(key (vlines ...)) (list (string->symbol (format #f "data-~a" key))
+                               (string-join (map (compose ->string value) vlines) ","))]
      [(key vline)
       (list (string->symbol (format #f "data-~a" key))
-            (format #f "~a" (value vline)))]
+            (->string (value vline)))]
      [_ (error "What are you doing‽")])
    (attributes event)))
 
@@ -354,7 +359,7 @@
          ,((compose (@ (vcomponent recurrence display) format-recurrence-rule)
                     (@ (vcomponent recurrence parse) parse-recurrence-rule))
            (attr ev 'RRULE))
-         ,@(awhen (attr ev 'EXDATE)
+         ,@(awhen (attr* ev 'EXDATE)
                   (list
                    ", undantaget "
                    (add-enumeration-punctuation
@@ -371,7 +376,7 @@
                                       '(HOURLY MINUTELY SECONDLY))
                                    (datetime->string d "~e ~b ~k:~M")
                                    (datetime->string d "~e ~b"))))
-                         it))))
+                         (map value it)))))
          "."))
 
 (define (format-description ev str)
-- 
cgit v1.2.3