diff options
| author | Hugo Hörnquist <hugo@hornquist.se> | 2019-10-04 00:15:19 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@hornquist.se> | 2019-10-04 00:15:19 +0200 |
| commit | 533b1994a73b6ae5003ad73109a600c0d05b4a92 (patch) | |
| tree | b4615e59afc7b4bb8fbd696bb9c8ceed5cce6b63 | |
| parent | Reintroduce color and name parsing. (diff) | |
| download | calp-533b1994a73b6ae5003ad73109a600c0d05b4a92.tar.gz calp-533b1994a73b6ae5003ad73109a600c0d05b4a92.tar.xz | |
Actually fix NAME.
| -rw-r--r-- | module/output/html.scm | 1 | ||||
| -rw-r--r-- | module/vcomponent/base.scm | 4 | ||||
| -rw-r--r-- | module/vcomponent/control.scm | 2 | ||||
| -rw-r--r-- | src/calendar.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/module/output/html.scm b/module/output/html.scm index 3df48159..cb3d07a5 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -221,6 +221,7 @@ ;; (display "<!doctype HTML>") (newline) + ((@ (sxml simple) sxml->xml) `(html (@ (lang sv)) (head diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index 399f7af9..3bd58c21 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -52,9 +52,9 @@ (define-public prop (make-procedure-with-setter (lambda (attr-obj prop-key) - (hashq-ref (struct-ref attr-obj 1) prop-key)) + (hash-ref (struct-ref attr-obj 1) prop-key)) (lambda (attr-obj prop-key val) - (hashq-set! (struct-ref attr-obj 1) prop-key val)))) + (hash-set! (struct-ref attr-obj 1) prop-key val)))) ;; Returns the properties of attribute as an assoc list. ;; @code{(map car <>)} leads to available properties. diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm index 38199161..3bdecc5a 100644 --- a/module/vcomponent/control.scm +++ b/module/vcomponent/control.scm @@ -5,7 +5,7 @@ (eval-when (expand load) ; No idea why I must have load here. - (define href (make-procedure-with-setter hashq-ref hashq-set!)) + (define href (make-procedure-with-setter hash-ref hash-set!)) (define (set-temp-values! table component kvs) (for-each (lambda (kv) diff --git a/src/calendar.c b/src/calendar.c index bafc13c3..f3a9b254 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -72,6 +72,8 @@ int handle_dir(SCM cal, char* path) { /* NAME is the `fancy' name of the calendar. */ // vcomponent_push_val(cal, "NAME", basename(path)); + scm_add_line_x(cal, scm_from_utf8_string("NAME"), + scm_make_vline(scm_from_utf8_stringn(basename(path), strlen(basename(path))))); SCM line = scm_make_vline(scm_from_utf8_string("vdir")); scm_add_line_x(cal, scm_from_utf8_string("X-HNH-SOURCETYPE"), line); |