From cce24634ae90274c002efcc1aea2434b0f0aa3c1 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Fri, 8 Nov 2024 12:51:22 -0500
Subject: [PATCH] Fix up the OMIT SAT SUN BEFORE... logic.

---
 include/holidays/tw.rem | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/holidays/tw.rem b/include/holidays/tw.rem
index 3c2745e2..5b8d5838 100644
--- a/include/holidays/tw.rem
+++ b/include/holidays/tw.rem
@@ -5,10 +5,10 @@
 
 OMIT 1 January MSG 中華民國開國紀念日
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG 中華民國開國紀念日（慶祝）
-REM 1 January OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MSG 中華民國開國紀念日（慶祝）
+REM 1 January OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG 中華民國開國紀念日（慶祝）
 OMIT 28 February MSG 和平紀念日
 REM 28 February OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 2, 28))==0 || wkdaynum(date($Ty, 2, 28))==6] MSG 和平紀念日（慶祝）
-REM 28 February OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MSG 和平紀念日（慶祝）
+REM 28 February OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 2, 28))==0 || wkdaynum(date($Ty, 2, 28))==6] MSG 和平紀念日（慶祝）
 REM 2 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 5] MSG 兒童節（慶祝）
 REM 3 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 1] MSG 兒童節（慶祝）
 REM 3 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 2] MSG 兒童節（慶祝）
@@ -16,9 +16,9 @@ REM 3 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 4] MSG 兒童節（慶祝）
 REM 3 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 5] MSG 兒童節（慶祝）
 OMIT 4 April MSG 兒童節
 REM 4 April OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 4, 4))==0 || wkdaynum(date($Ty, 4, 4))==6] MSG 清明節（慶祝）
-REM 4 April OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MSG 清明節（慶祝）
+REM 4 April OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 4, 4))==0 || wkdaynum(date($Ty, 4, 4))==6] MSG 清明節（慶祝）
 REM 5 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 2] MSG 兒童節（慶祝）
 REM 5 April SCANFROM -28 ADDOMIT SATISFY [$Tw == 5] MSG 兒童節（慶祝）
 OMIT 10 October MSG 中華民國國慶日
 REM 10 October OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 10, 10))==0 || wkdaynum(date($Ty, 10, 10))==6] MSG 中華民國國慶日（慶祝）
-REM 10 October OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MSG 中華民國國慶日（慶祝）
+REM 10 October OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 MAYBE-UNCOMPUTABLE SATISFY [wkdaynum(date($Ty, 10, 10))==0 || wkdaynum(date($Ty, 10, 10))==6] MSG 中華民國國慶日（慶祝）