diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-23 04:14:46 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-06-23 04:14:46 +0200 |
commit | 2fb88465f7a25b1eac0cdbb78a05de9e78e68bfd (patch) | |
tree | c48c312e1d44306039fc00cfe4b5cd611d7f9a3b /module/vcomponent | |
parent | Remove procedure tabset. (diff) | |
download | calp-2fb88465f7a25b1eac0cdbb78a05de9e78e68bfd.tar.gz calp-2fb88465f7a25b1eac0cdbb78a05de9e78e68bfd.tar.xz |
Normalize keyword syntax.
Diffstat (limited to '')
-rw-r--r-- | module/vcomponent/base.scm | 5 | ||||
-rw-r--r-- | module/vcomponent/control.scm | 6 | ||||
-rw-r--r-- | module/vcomponent/datetime.scm | 40 | ||||
-rw-r--r-- | module/vcomponent/formats/ical/output.scm | 3 | ||||
-rw-r--r-- | module/vcomponent/recurrence.scm | 12 | ||||
-rw-r--r-- | module/vcomponent/recurrence/display.scm | 3 | ||||
-rw-r--r-- | module/vcomponent/recurrence/internal.scm | 20 | ||||
-rw-r--r-- | module/vcomponent/recurrence/parse.scm | 24 | ||||
-rw-r--r-- | module/vcomponent/util/control.scm | 6 | ||||
-rw-r--r-- | module/vcomponent/util/group.scm | 16 |
10 files changed, 69 insertions, 66 deletions
diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm index e79a4d5c..b62d45c2 100644 --- a/module/vcomponent/base.scm +++ b/module/vcomponent/base.scm @@ -4,6 +4,7 @@ :use-module (srfi srfi-9) :use-module (srfi srfi-9 gnu) :use-module (srfi srfi-17) + :use-module (srfi srfi-88) :use-module (ice-9 hash-table) :export (make-vline vline? @@ -70,7 +71,7 @@ (make-procedure-with-setter get-source set-source!)) -(define* (make-vline key value #:optional (ht (make-hash-table))) +(define* (make-vline key value optional: (ht (make-hash-table))) (make-vline% key value ht)) (define-record-type <vcomponent> @@ -94,7 +95,7 @@ (make-procedure-with-setter get-component-parent set-component-parent!)) -(define* (make-vcomponent #:optional (type 'VIRTUAL)) +(define* (make-vcomponent optional: (type 'VIRTUAL)) (make-vcomponent% type '() #f (make-hash-table))) (define (add-child! parent child) diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm index 63f1e1e3..0869543d 100644 --- a/module/vcomponent/control.scm +++ b/module/vcomponent/control.scm @@ -1,7 +1,7 @@ (define-module (vcomponent util control) - #:use-module (hnh util) - #:use-module (vcomponent) - #:export (with-replaced-properties)) + :use-module (hnh util) + :use-module (vcomponent) + :export (with-replaced-properties)) (eval-when (expand load) ; No idea why I must have load here. diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm index 5fb1148c..73d74363 100644 --- a/module/vcomponent/datetime.scm +++ b/module/vcomponent/datetime.scm @@ -1,31 +1,31 @@ (define-module (vcomponent datetime) - #:use-module (srfi srfi-1) - #:use-module (vcomponent base) - #:use-module (datetime) - #:use-module (datetime timespec) - #:use-module (datetime zic) - #:use-module (hnh util) + :use-module (srfi srfi-1) + :use-module (vcomponent base) + :use-module (datetime) + :use-module (datetime timespec) + :use-module (datetime zic) + :use-module (hnh util) :use-module (ice-9 curried-definitions) - #:export (#;parse-datetime - event-overlaps? - overlapping? - event-contains? - event-zero-length? - ev-time<? + :export (#;parse-datetime + event-overlaps? + overlapping? + event-contains? + event-zero-length? + ev-time<? - event-length - event-length/clamped - event-length/day + event-length + event-length/clamped + event-length/day - long-event? - really-long-event? + long-event? + really-long-event? - events-between + events-between - zoneinfo->vtimezone - )) + zoneinfo->vtimezone + )) ;;; date time pointer #; diff --git a/module/vcomponent/formats/ical/output.scm b/module/vcomponent/formats/ical/output.scm index fbb9c862..da891fa6 100644 --- a/module/vcomponent/formats/ical/output.scm +++ b/module/vcomponent/formats/ical/output.scm @@ -10,6 +10,7 @@ :use-module (srfi srfi-1) :use-module (srfi srfi-41) :use-module (srfi srfi-41 util) + :use-module (srfi srfi-88) :use-module (vcomponent) :use-module (vcomponent datetime) :use-module (vcomponent geo) @@ -118,7 +119,7 @@ ;; not a problem. ;; Setting the wrap-len to slightly lower than allowed also help ;; us not overshoot. -(define* (ical-line-fold string #:key (wrap-len 70)) +(define* (ical-line-fold string key: (wrap-len 70)) (cond [(< wrap-len (string-length string)) (format #f "~a\r\n ~a" (string-take string wrap-len) diff --git a/module/vcomponent/recurrence.scm b/module/vcomponent/recurrence.scm index 29cbbc64..ffda0e7f 100644 --- a/module/vcomponent/recurrence.scm +++ b/module/vcomponent/recurrence.scm @@ -1,7 +1,7 @@ (define-module (vcomponent recurrence) - #:use-module (vcomponent recurrence generate) - #:use-module (vcomponent recurrence parse) - #:use-module (vcomponent recurrence internal) - #:re-export (generate-recurrence-set - parse-recurrence-rule - repeating? make-recur-rule)) + :use-module (vcomponent recurrence generate) + :use-module (vcomponent recurrence parse) + :use-module (vcomponent recurrence internal) + :re-export (generate-recurrence-set + parse-recurrence-rule + repeating? make-recur-rule)) diff --git a/module/vcomponent/recurrence/display.scm b/module/vcomponent/recurrence/display.scm index 8a9f33e6..8aa9f506 100644 --- a/module/vcomponent/recurrence/display.scm +++ b/module/vcomponent/recurrence/display.scm @@ -1,10 +1,11 @@ (define-module (vcomponent recurrence display) :use-module (vcomponent recurrence display common) :use-module (hnh util language) + :use-module (srfi srfi-88) :re-export (rrule-month->string) :export (format-recurrence-rule)) -(define* (format-recurrence-rule rrule #:optional (language (resolve-language))) +(define* (format-recurrence-rule rrule optional: (language (resolve-language))) ((module-ref (resolve-interface `(vcomponent recurrence display ,language)) 'format-recurrence-rule) rrule)) diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm index 9cb6b115..94c4cccf 100644 --- a/module/vcomponent/recurrence/internal.scm +++ b/module/vcomponent/recurrence/internal.scm @@ -1,14 +1,14 @@ (define-module (vcomponent recurrence internal) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-71) - #:use-module (srfi srfi-88) ; better keywords - #:use-module ((vcomponent base) :select (prop)) - #:use-module (ice-9 i18n) - #:use-module (srfi srfi-9) - #:use-module (srfi srfi-9 gnu) - #:use-module (ice-9 format) - #:use-module (hnh util) - #:use-module (datetime) + :use-module (srfi srfi-1) + :use-module (srfi srfi-71) + :use-module (srfi srfi-88) ; better keywords + :use-module ((vcomponent base) :select (prop)) + :use-module (ice-9 i18n) + :use-module (srfi srfi-9) + :use-module (srfi srfi-9 gnu) + :use-module (ice-9 format) + :use-module (hnh util) + :use-module (datetime) :replace (count) :export (repeating? diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm index 91209dc7..12b6a622 100644 --- a/module/vcomponent/recurrence/parse.scm +++ b/module/vcomponent/recurrence/parse.scm @@ -1,16 +1,16 @@ (define-module (vcomponent recurrence parse) - #:duplicates (last) ; Replace @var{count} - - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-71) - #:use-module (datetime) - #:use-module (srfi srfi-26) - #:use-module (vcomponent recurrence internal) - #:use-module (hnh util) - #:use-module (hnh util exceptions) - #:use-module (ice-9 match) - - #:export (rfc->datetime-weekday + :duplicates (last) ; Replace @var{count} + + :use-module (srfi srfi-1) + :use-module (srfi srfi-71) + :use-module (datetime) + :use-module (srfi srfi-26) + :use-module (vcomponent recurrence internal) + :use-module (hnh util) + :use-module (hnh util exceptions) + :use-module (ice-9 match) + + :export (rfc->datetime-weekday parse-recurrence-rule)) diff --git a/module/vcomponent/util/control.scm b/module/vcomponent/util/control.scm index 63f1e1e3..0869543d 100644 --- a/module/vcomponent/util/control.scm +++ b/module/vcomponent/util/control.scm @@ -1,7 +1,7 @@ (define-module (vcomponent util control) - #:use-module (hnh util) - #:use-module (vcomponent) - #:export (with-replaced-properties)) + :use-module (hnh util) + :use-module (vcomponent) + :export (with-replaced-properties)) (eval-when (expand load) ; No idea why I must have load here. diff --git a/module/vcomponent/util/group.scm b/module/vcomponent/util/group.scm index 89ec47a1..4001c590 100644 --- a/module/vcomponent/util/group.scm +++ b/module/vcomponent/util/group.scm @@ -1,12 +1,12 @@ (define-module (vcomponent util group) - #:use-module (vcomponent) - #:use-module (vcomponent datetime) - #:use-module (datetime) - #:use-module (srfi srfi-41) - #:use-module (srfi srfi-41 util) - #:export (group-stream - get-groups-between - group->event-list)) + :use-module (vcomponent) + :use-module (vcomponent datetime) + :use-module (datetime) + :use-module (srfi srfi-41) + :use-module (srfi srfi-41 util) + :export (group-stream + get-groups-between + group->event-list)) ;; TODO templetize this (define-stream (group-stream in-stream) |