3 files changed, 14 insertions, 1 deletions
diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm
index 3bd58c21..246566ee 100644
--- a/module/vcomponent/base.scm
+++ b/module/vcomponent/base.scm
@@ -3,6 +3,7 @@
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-17)
   :use-module (vcomponent primitive)
+  :use-module (ice-9 hash-table)
   :use-module ((ice-9 optargs) :select (define*-public)))
 
 ;; vline → value
@@ -76,12 +77,20 @@
 (define*-public (children component)
   (struct-ref component 1))
 
+(define (copy-vline vline)
+  (make-struct/no-tail (struct-vtable vline)
+                       (struct-ref vline 0)
+                       ;; TODO deep-copy on properties?
+                       (struct-ref vline 1)))
+
 (define-public (copy-vcomponent component)
   (make-struct/no-tail (struct-vtable component)
                        (struct-ref component 0)
                        (struct-ref component 1)
                        (struct-ref component 2)
-                       (struct-ref component 3)))
+                       (alist->hash-table
+                        (hash-map->list (lambda (key value) (cons key (copy-vline value)))
+                                        (struct-ref component 3)))))
 
 ;; (define-public filter-children! %vcomponent-filter-children!)
 
diff --git a/module/vcomponent/group.scm b/module/vcomponent/group.scm
index c5b6948e..41123126 100644
--- a/module/vcomponent/group.scm
+++ b/module/vcomponent/group.scm
@@ -7,6 +7,7 @@
   #:use-module (srfi srfi-41 util)
   #:export (group-stream))
 
+;; TODO templetize this
 (define-stream (group-stream in-stream)
   (define (ein? day) (lambda (e) (event-contains? e (date->time-utc day))))
 
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm
index c2863954..3f4cb869 100644
--- a/module/vcomponent/recurrence/generate.scm
+++ b/module/vcomponent/recurrence/generate.scm
@@ -51,6 +51,9 @@
                  (get-tz-offset e)
                  0))))
 
+    (set! (attr ev 'DTSTART)
+      (copy-time (attr ev 'DTSTART)))
+
     (let ((i (interval r)))
      (case (freq r)
        ((SECONDLY) (mod! (second d) = (+ i)))