From ac949ce7bda41d05db87e86d1546d83db1395a85 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sat, 14 Jan 2023 14:26:38 -0500
Subject: [PATCH] Proper definition for US tax day.

---
 examples/defs.rem | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/examples/defs.rem b/examples/defs.rem
index 4db3b04f..80354e44 100644
--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -157,8 +157,24 @@ REM Last Sunday in October ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST
 REM First Sunday in November ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
 
 REM     Apr  1		MSG %"April Fool's%" Day
-FSET _ustax(x) (wkdaynum(x) == 1 && day(x) != 15)
-REM OMITFUNC _ustax Mon Tue Wed Thu 15 Apr AFTER MSG %"Tax Day%"
+
+# US Tax Day
+PUSH-OMIT-CONTEXT
+# Normal case: 16 April falls Mon-Fri
+REM 16 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw >= 1 && $Tw <= 5] MSG Emancipation Day
+
+# 16 April falls on Saturday: Observe on the 15th
+REM 15 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw == 5] MSG Emancipation Day (observed)
+
+# 16 April falls on Sunday: Observe on the 17th
+REM 17 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Emancipation Day (observed)
+
+# If you live in Maine or Massachussetts, uncomment the next line
+# REM Third Monday in April SCANFROM -7 ADDOMIT MSG Patriots Day
+
+REM Apr 15 OMIT Sat Sun AFTER MSG Tax Day
+POP-OMIT-CONTEXT
+
 REM     May  5		MSG %"Cinco de Mayo%"
 REM First Sat in May 	MSG %"Kentucky Derby%"
 REM Second Sun in May	MSG %"Mother's Day%"