1 files changed, 39 insertions, 30 deletions

diff --git a/module/vcomponent/formats/xcal/output.scm b/module/vcomponent/formats/xcal/output.scm
index 8e92b280..7cf8c591 100644
--- a/module/vcomponent/formats/xcal/output.scm
+++ b/module/vcomponent/formats/xcal/output.scm
@@ -8,28 +8,31 @@
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (calp translation)
+  :use-module (calp namespaces)
+  :use-module (sxml namespaced)
+  :use-module (sxml namespaced util)
   :export (vcomponent->sxcal ns-wrap))
 
 
 (define (vline->value-tag vline)
-  (define key (vline-key vline))
+  (define k (key vline))
 
   (define writer
    (cond
     [(and=> (param vline 'VALUE) (compose string->symbol car))
      => get-writer]
-    [(memv key '(COMPLETED DTEND DUE DTSTART RECURRENCE-ID
+    [(memv k '(COMPLETED DTEND DUE DTSTART RECURRENCE-ID
                         CREATED DTSTAMP LAST-MODIFIED
                         ACKNOWLEDGED EXDATE))
      (get-writer 'DATE-TIME)]
 
-    [(memv key '(TRIGGER DURATION))
+    [(memv k '(TRIGGER DURATION))
      (get-writer 'DURATION)]
 
-    [(memv key '(FREEBUSY))
+    [(memv k '(FREEBUSY))
      (get-writer 'PERIOD)]
 
-    [(memv key '(CALSCALE METHOD PRODID COMMENT DESCRIPTION
+    [(memv k '(CALSCALE METHOD PRODID COMMENT DESCRIPTION
                        LOCATION SUMMARY TZID TZNAME
                        CONTACT RELATED-TO UID
 
@@ -38,69 +41,69 @@
                        VERSION))
      (get-writer 'TEXT)]
 
-    [(memv key '(TRANSP
+    [(memv k '(TRANSP
               CLASS
               PARTSTAT
               STATUS
               ACTION))
      (lambda (p v) ((get-writer 'TEXT) p (symbol->string v)))]
 
-    [(memv key '(TZOFFSETFROM TZOFFSETTO))
+    [(memv k '(TZOFFSETFROM TZOFFSETTO))
      (get-writer 'UTC-OFFSET)]
 
-    [(memv key '(ATTACH TZURL URL))
+    [(memv k '(ATTACH TZURL URL))
      (get-writer 'URI)]
 
-    [(memv key '(PERCENT-COMPLETE PRIORITY REPEAT SEQUENCE))
+    [(memv k '(PERCENT-COMPLETE PRIORITY REPEAT SEQUENCE))
      (get-writer 'INTEGER)]
 
-    [(memv key '(GEO))
+    [(memv k '(GEO))
      (lambda (_ v)
-       `(geo
+       `(,(xml xcal 'geo)
          (latitude ,(geo-latitude v))
          (longitude ,(geo-longitude v))))]
 
-    [(memv key '(RRULE))
+    [(memv k '(RRULE))
      (get-writer 'RECUR)]
 
-    [(memv key '(ORGANIZER ATTENDEE))
+    [(memv k '(ORGANIZER ATTENDEE))
      (get-writer 'CAL-ADDRESS)]
 
-    [(x-property? key)
+    [(x-property? k)
      (get-writer 'TEXT)]
 
     [else
-     (warning (G_ "Unknown key ~a") key)
+     (warning (G_ "Unknown key ~a") k)
      (get-writer 'TEXT)]))
 
-  (writer ((@@ (vcomponent base) get-vline-parameters) vline) (value vline)))
+  (writer ((@@ (vcomponent base) get-vline-parameters) vline)
+          (value vline)))
 
 (define (property->value-tag tag . values)
   (if (or (eq? tag 'VALUE)
           (internal-field? tag))
       #f
-      `(,(downcase-symbol tag)
+      `(,(xml xcal (downcase-symbol tag))
         ,@(map (lambda (v)
                  ;; TODO parameter types!!!! (rfc6321 3.5.)
-                 `(text ,(->string v)))
+                 `(,(xml xcal 'text) ,(->string v)))
                values))))
 
 ;; ((key value ...) ...) -> `(parameters , ... )
 (define (parameters-tag parameters)
   (define outparams (filter-map
-                     (lambda (x) (apply property->value-tag x))
+                     (lambda (x) (property->value-tag x))
                      parameters))
 
   (unless (null? outparams)
-    `(parameters ,@outparams)))
+    `(,(xml xcal 'parameters) ,@outparams)))
 
 (define (vcomponent->sxcal component)
 
   (define tagsymb (downcase-symbol (type component)))
 
-
   (remove null?
-   `(,tagsymb
+   `(,(xml xcal tagsymb)
      ;; only have <properties> when it's non-empty.
      ,(let ((props
              (filter-map
@@ -108,27 +111,33 @@
                 [(? (compose internal-field? car)) #f]
 
                 [(key vlines ...)
+                 (format (current-error-port) "vlines: ~s~%" vlines)
                  (remove null?
-                         `(,(downcase-symbol key)
+                         `(,(xml xcal (downcase-symbol key))
                            ,(parameters-tag (reduce assq-merge
-                                                    '() (map parameters vlines)))
+                                                    '()
+                                                    (map parameters vlines)))
                            ,@(for vline in vlines
                                   (vline->value-tag vline))))]
 
                 [(key . vline)
                  (remove null?
-                         `(,(downcase-symbol key)
+                         `(,(xml xcal (downcase-symbol key))
                            ,(parameters-tag (parameters vline))
                            ,(vline->value-tag vline)))])
-              (properties component))))
+              ;; NOTE this sort is unnecesasary, but here so tests can work
+              ;; Possibly add it as a flag instead
+              (sort* (properties component)
+                     string< (compose symbol->string car)))))
         (unless (null? props)
-          `(properties
+          `(,(xml xcal 'properties)
             ;; NOTE
             ;; (x-hnh-calendar-name (text ,(prop (parent component) 'NAME)))
             ,@props)))
      ,(unless (null? (children component))
-        `(components ,@(map vcomponent->sxcal (children component)))))))
+        `(,(xml xcal 'components)
+          ,@(map vcomponent->sxcal (children component)))))))
 
 (define (ns-wrap sxml)
-  `(icalendar (@ (xmlns "urn:ietf:params:xml:ns:icalendar-2.0"))
-              ,sxml))
+  `(,(xml xcal 'icalendar)
+    ,sxml))