diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-11-01 03:14:05 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-11-06 00:46:26 +0100 |
| commit | e4b41df44abad660f3bbbcf28abcd5838068c14b (patch) | |
| tree | fe024c17f6cd8448e060cd14abad1824ae93b116 /module | |
| parent | Cleanup in (text numbers sv) (diff) | |
| download | calp-e4b41df44abad660f3bbbcf28abcd5838068c14b.tar.gz calp-e4b41df44abad660f3bbbcf28abcd5838068c14b.tar.xz | |
Fix API for each-string.
Diffstat (limited to 'module')
| -rw-r--r-- | module/text/numbers.scm | 14 | ||||
| -rw-r--r-- | module/text/numbers/sv.scm | 2 | ||||
| -rw-r--r-- | module/vcomponent/recurrence/display/en.scm | 3 | ||||
| -rw-r--r-- | module/vcomponent/recurrence/display/sv.scm | 3 |
4 files changed, 8 insertions, 14 deletions
diff --git a/module/text/numbers.scm b/module/text/numbers.scm index debd7f17..ad859a16 100644 --- a/module/text/numbers.scm +++ b/module/text/numbers.scm @@ -27,16 +27,8 @@ rest: extra-kvs) (apply (get language 'number->string-ordinal) n extra-kvs)) -;; TODO change API to allow language, and stop having random extra -;; arguments for implementations. -(define* (each-string count . args) - (define language (resolve-language)) +(define* (each-string count + optional: (language (resolve-language)) + rest: extra-kvs) (apply (get language 'each-string) count args)) - -;; scheme@(guile-user)> (number->string-cardinal 123) -;; $10 = "hundratjugotre" -;; scheme@(guile-user)> (number->string-ordinal 123) -;; $11 = "hundratjugotredje" -;; scheme@(guile-user)> (each-string 10) -;; $12 = "var tionde" diff --git a/module/text/numbers/sv.scm b/module/text/numbers/sv.scm index 317a0fa4..5d6e8952 100644 --- a/module/text/numbers/sv.scm +++ b/module/text/numbers/sv.scm @@ -181,7 +181,7 @@ ;; (each-string 2) ; => "varannan" ;; (each-string 3) ; => "var tredje" ;; (each-string 3 #t) ; => "vart tredje" -(define* (each-string count optional: neutrum) +(define* (each-string count key: neutrum allow-other-keys:) (string-flatten (cons "var" diff --git a/module/vcomponent/recurrence/display/en.scm b/module/vcomponent/recurrence/display/en.scm index 18d11dba..a361be1e 100644 --- a/module/vcomponent/recurrence/display/en.scm +++ b/module/vcomponent/recurrence/display/en.scm @@ -83,7 +83,8 @@ [else (list " " - (each-string (interval rrule) (eq? 'YEARLY (freq rrule))) + (each-string (interval rrule) + neutrum: (eq? 'YEARLY (freq rrule))) " " (case (freq rrule) ;; p.44 RFC 5545 diff --git a/module/vcomponent/recurrence/display/sv.scm b/module/vcomponent/recurrence/display/sv.scm index ee8fc3fd..14ddc2c3 100644 --- a/module/vcomponent/recurrence/display/sv.scm +++ b/module/vcomponent/recurrence/display/sv.scm @@ -91,7 +91,8 @@ [else (list " " - (each-string (interval rrule) (eq? 'YEARLY (freq rrule))) + (each-string (interval rrule) + neutrum: (eq? 'YEARLY (freq rrule))) " " (case (freq rrule) ;; p.44 RFC 5545 |