diff options
author | Hugo Hörnquist <hugo@hornquist.se> | 2019-04-23 18:03:49 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@hornquist.se> | 2019-04-23 18:03:49 +0200 |
commit | 8f4fbcd493e28c86c598efcecdb6dc79d8fe0bfe (patch) | |
tree | 37e49d78df0916efcb0d547e0b28b63247cfec3d /module | |
parent | Change event-length => event-length/day. (diff) | |
download | calp-8f4fbcd493e28c86c598efcecdb6dc79d8fe0bfe.tar.gz calp-8f4fbcd493e28c86c598efcecdb6dc79d8fe0bfe.tar.xz |
Rename module vcalendar => vcomponent.
Diffstat (limited to 'module')
-rwxr-xr-x | module/fetch.scm | 6 | ||||
-rw-r--r-- | module/html/html.scm | 12 | ||||
-rwxr-xr-x | module/main.scm | 8 | ||||
-rw-r--r-- | module/vcomponent.scm (renamed from module/vcalendar.scm) | 10 | ||||
-rw-r--r-- | module/vcomponent/control.scm (renamed from module/vcalendar/control.scm) | 4 | ||||
-rw-r--r-- | module/vcomponent/datetime.scm (renamed from module/vcalendar/datetime.scm) | 4 | ||||
-rw-r--r-- | module/vcomponent/output.scm (renamed from module/vcalendar/output.scm) | 6 | ||||
-rw-r--r-- | module/vcomponent/primitive.scm (renamed from module/vcalendar/primitive.scm) | 2 | ||||
-rw-r--r-- | module/vcomponent/recurrence.scm (renamed from module/vcalendar/recurrence.scm) | 6 | ||||
-rw-r--r-- | module/vcomponent/recurrence/generate.scm (renamed from module/vcalendar/recurrence/generate.scm) | 10 | ||||
-rw-r--r-- | module/vcomponent/recurrence/internal.scm (renamed from module/vcalendar/recurrence/internal.scm) | 2 | ||||
-rw-r--r-- | module/vcomponent/recurrence/parse.scm (renamed from module/vcalendar/recurrence/parse.scm) | 6 | ||||
-rw-r--r-- | module/vcomponent/timezone.scm (renamed from module/vcalendar/timezone.scm) | 8 |
13 files changed, 41 insertions, 43 deletions
diff --git a/module/fetch.scm b/module/fetch.scm index a91e4d0d..b01329a8 100755 --- a/module/fetch.scm +++ b/module/fetch.scm @@ -12,9 +12,9 @@ (use-modules (srfi srfi-1) (srfi srfi-19) (srfi srfi-26) - (vcalendar) - (vcalendar datetime) - (vcalendar output) + (vcomponent) + (vcomponent datetime) + (vcomponent output) (util)) diff --git a/module/html/html.scm b/module/html/html.scm index d7a52a53..44745ba0 100644 --- a/module/html/html.scm +++ b/module/html/html.scm @@ -2,14 +2,12 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-41) #:use-module (srfi srfi-41 util) - #:use-module (vcalendar) - #:use-module (vcalendar datetime) + #:use-module (vcomponent) + #:use-module (vcomponent datetime) #:use-module (util) #:use-module (util tree) #:use-module (srfi srfi-19) - #:use-module (srfi srfi-19 util) - - ) + #:use-module (srfi srfi-19 util)) (define-stream (group-stream in-stream) (define (ein? day) (lambda (e) (event-in? e (date->time-utc day)))) @@ -56,9 +54,9 @@ ;; smaller event. (sort* lst time>? (lambda (e) (event-length/day e start-of-day)))))) +;; This should only be used on time intervals, never on absolute times. +;; For that see @var{date->decimal-hour}. (define (time->decimal-hour time) - "This should only be used on time intervals, -never on absolute times. For that see date->decimal-hour" (exact->inexact (/ (time-second time) 3600))) diff --git a/module/main.scm b/module/main.scm index 1b38e6e2..6a2cd9c9 100755 --- a/module/main.scm +++ b/module/main.scm @@ -14,10 +14,10 @@ (ice-9 control) ; call-with-escape-continuation (texinfo string-utils) ; string->wrapped-lines (util) - (vcalendar) - (vcalendar recurrence) - (vcalendar datetime) - (vcalendar output) + (vcomponent) + (vcomponent recurrence) + (vcomponent datetime) + (vcomponent output) (terminal escape) (terminal util) diff --git a/module/vcalendar.scm b/module/vcomponent.scm index dbab308c..22eafb57 100644 --- a/module/vcalendar.scm +++ b/module/vcomponent.scm @@ -1,8 +1,8 @@ -(define-module (vcalendar) - #:use-module (vcalendar primitive) - #:use-module (vcalendar datetime) - #:use-module (vcalendar recurrence) - #:use-module (vcalendar timezone) +(define-module (vcomponent) + #:use-module (vcomponent primitive) + #:use-module (vcomponent datetime) + #:use-module (vcomponent recurrence) + #:use-module (vcomponent timezone) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-19 util) diff --git a/module/vcalendar/control.scm b/module/vcomponent/control.scm index a38d678f..38199161 100644 --- a/module/vcalendar/control.scm +++ b/module/vcomponent/control.scm @@ -1,6 +1,6 @@ -(define-module (vcalendar control) +(define-module (vcomponent control) #:use-module (util) - #:use-module (vcalendar) + #:use-module (vcomponent) #:export (with-replaced-attrs)) diff --git a/module/vcalendar/datetime.scm b/module/vcomponent/datetime.scm index 1e5b5853..2270d10e 100644 --- a/module/vcalendar/datetime.scm +++ b/module/vcomponent/datetime.scm @@ -1,5 +1,5 @@ -(define-module (vcalendar datetime) - #:use-module (vcalendar) +(define-module (vcomponent datetime) + #:use-module (vcomponent) #:use-module (srfi srfi-19) #:use-module (srfi srfi-19 util) #:use-module (util) diff --git a/module/vcalendar/output.scm b/module/vcomponent/output.scm index 2abc1e08..d5cf0f32 100644 --- a/module/vcalendar/output.scm +++ b/module/vcomponent/output.scm @@ -1,6 +1,6 @@ -(define-module (vcalendar output) - #:use-module (vcalendar) - #:use-module (vcalendar control) +(define-module (vcomponent output) + #:use-module (vcomponent) + #:use-module (vcomponent control) #:use-module (util) #:use-module (srfi srfi-19 util) #:use-module (srfi srfi-26) diff --git a/module/vcalendar/primitive.scm b/module/vcomponent/primitive.scm index 27ae6e17..b583d454 100644 --- a/module/vcalendar/primitive.scm +++ b/module/vcomponent/primitive.scm @@ -1,6 +1,6 @@ ;;; Primitive export of symbols linked from C binary. -(define-module (vcalendar primitive) +(define-module (vcomponent primitive) #:export (%vcomponent-children %vcomponent-push-child! %vcomponent-filter-children! diff --git a/module/vcalendar/recurrence.scm b/module/vcomponent/recurrence.scm index ae08feb6..d1113477 100644 --- a/module/vcalendar/recurrence.scm +++ b/module/vcomponent/recurrence.scm @@ -1,6 +1,6 @@ -(define-module (vcalendar recurrence) - #:use-module (vcalendar) - #:use-module (vcalendar recurrence generate) +(define-module (vcomponent recurrence) + #:use-module (vcomponent) + #:use-module (vcomponent recurrence generate) #:re-export (generate-recurrence-set) #:export (repeating?)) diff --git a/module/vcalendar/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index 3baaa6eb..9b611ecd 100644 --- a/module/vcalendar/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -1,4 +1,4 @@ -(define-module (vcalendar recurrence generate) +(define-module (vcomponent recurrence generate) #:use-module (srfi srfi-19) ; Datetime #:use-module (srfi srfi-19 util) #:use-module (srfi srfi-19 setters) @@ -7,10 +7,10 @@ #:use-module (ice-9 match) #:use-module (util) - #:use-module (vcalendar) - #:use-module (vcalendar timezone) - #:use-module (vcalendar recurrence internal) - #:use-module (vcalendar recurrence parse) + #:use-module (vcomponent) + #:use-module (vcomponent timezone) + #:use-module (vcomponent recurrence internal) + #:use-module (vcomponent recurrence parse) #:export (generate-recurrence-set) ) diff --git a/module/vcalendar/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm index 7a81b2db..f7095d1d 100644 --- a/module/vcalendar/recurrence/internal.scm +++ b/module/vcomponent/recurrence/internal.scm @@ -1,4 +1,4 @@ -(define-module (vcalendar recurrence internal) +(define-module (vcomponent recurrence internal) #:use-module (util) #:use-module ((ice-9 optargs) #:select (define*-public)) #:use-module (srfi srfi-88) diff --git a/module/vcalendar/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm index 50d0e0a8..7df0e2e6 100644 --- a/module/vcalendar/recurrence/parse.scm +++ b/module/vcomponent/recurrence/parse.scm @@ -1,11 +1,11 @@ -(define-module (vcalendar recurrence parse) +(define-module (vcomponent recurrence parse) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) ; Datetime #:use-module (srfi srfi-19 util) #:use-module (srfi srfi-26) - #:use-module ((vcalendar datetime) #:select (parse-datetime)) + #:use-module ((vcomponent datetime) #:select (parse-datetime)) #:duplicates (last) ; Replace @var{count} - #:use-module (vcalendar recurrence internal) + #:use-module (vcomponent recurrence internal) #:use-module (util) #:use-module (exceptions) #:use-module (ice-9 curried-definitions) diff --git a/module/vcalendar/timezone.scm b/module/vcomponent/timezone.scm index 560289d4..5b262f1c 100644 --- a/module/vcalendar/timezone.scm +++ b/module/vcomponent/timezone.scm @@ -1,13 +1,13 @@ -(define-module (vcalendar timezone) - :use-module (vcalendar) +(define-module (vcomponent timezone) + :use-module (vcomponent) :use-module ((srfi srfi-1) :select (find)) :use-module (srfi srfi-19) :use-module (srfi srfi-19 util) :use-module (srfi srfi-41) :use-module (srfi srfi-41 util) :use-module (util) - :use-module ((vcalendar recurrence generate) :select (generate-recurrence-set)) - :use-module ((vcalendar datetime) :select (ev-time<?)) + :use-module ((vcomponent recurrence generate) :select (generate-recurrence-set)) + :use-module ((vcomponent datetime) :select (ev-time<?)) ) ;;@begin exampe |