From cc521cd440a482182f7452d5640d96d1c96d89f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Wed, 13 May 2020 18:12:43 +0200
Subject: Week day limiter working?

---
 module/vcomponent/recurrence/display/test.scm | 5 +----
 module/vcomponent/recurrence/generate-alt.scm | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'module/vcomponent/recurrence')

diff --git a/module/vcomponent/recurrence/display/test.scm b/module/vcomponent/recurrence/display/test.scm
index f7ed6714..3e1b4159 100644
--- a/module/vcomponent/recurrence/display/test.scm
+++ b/module/vcomponent/recurrence/display/test.scm
@@ -235,7 +235,6 @@ components are specified, the day is gotten from \"DTSTART\"."
   ;; => "varje torsdag i juni, juli & augusti, årligen"
 
   ;; NOTE This has some weird grammar in swedish
-  ;; TODO bunch of wrong days
   (vevent
    summary: "Every Friday the 13th, forever"
    dtstart: "19970902T090000"
@@ -243,21 +242,19 @@ components are specified, the day is gotten from \"DTSTART\"."
    rrule: "FREQ=MONTHLY;BYDAY=FR;BYMONTHDAY=13")
   ;; => "varje fredag den trettonde varje månad"
 
-  ;; TODO bunch of wrong days
   (vevent
    summary: "The first Saturday that follows the first Sunday of the month,forever"
    dtstart: "19970913T090000"
    rrule: "FREQ=MONTHLY;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13")
   ;; => "varje lördag den sjunde, åttonde, nionde, tionde, elfte, tolfte & trettonde varje månad"
 
-  ;; TODO
   (vevent
    summary:
    "Every 4 years, the first Tuesday after a Monday in November,
 forever (U.S. Presidential Election day)"
    dtstart: "19961105T090000"
    rrule: "FREQ=YEARLY;INTERVAL=4;BYMONTH=11;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8")
-  ;; => "varje tisdag  i novembervart fjärde år"
+  ;; TODO, bör vara `eller'
   ;; => "varje tisdag den andre, tredje, fjärde, femte, sjätte, sjunde & åttonde i november vart fjärde år"
 
   ;; TODO bysetpos
diff --git a/module/vcomponent/recurrence/generate-alt.scm b/module/vcomponent/recurrence/generate-alt.scm
index 2617481c..cd45abde 100644
--- a/module/vcomponent/recurrence/generate-alt.scm
+++ b/module/vcomponent/recurrence/generate-alt.scm
@@ -98,7 +98,7 @@
   (make-extenders
    rrule
    [YEARLY   ||  day #| setpos |#]
-   [MONTHLY  || month #| day |# #|setpos|#]
+   [MONTHLY  || month day #|setpos|#]
    [WEEKLY   || month #|setpos|#]
    [DAILY    || month monthday day #|setpos|#]
    [HOURLY   || month yearday monthday day hour #|setpos|#]
-- 
cgit v1.2.3