From 588d9debe80514f2203c03650da41628de796017 Mon Sep 17 00:00:00 2001 From: Dianne Skoll Date: Wed, 5 Oct 2022 11:12:21 -0400 Subject: [PATCH] Simplify American Independence Day example. --- examples/defs.rem | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/defs.rem b/examples/defs.rem index 6d224dba..b8f45429 100644 --- a/examples/defs.rem +++ b/examples/defs.rem @@ -77,16 +77,16 @@ REM 1 MSG John's [_mo_num(11, 1984)] 'monthly' anniversary ############################################################################ # If it falls on a Saturday, bump to previous Friday -REM 4 July OMIT SAT SCANFROM -1 BEFORE ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed) +REM 3 JULY SCANFROM -7 ADDOMIT SATISFY [$Tw == 5] MSG Independence day (observed) # If it falls on a Sunday, bump to following Monday -REM 4 July OMIT SUN SCANFROM -7 AFTER ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed) +REM 5 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Independence day (observed) # If it falls on Sat or Sun, note the actual day -REM 4 July SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual) +REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual) # Otherwise observed and actual is on the 4th -REM 4 July OMIT SAT SUN SKIP SCANFROM -7 ADDOMIT MSG Independence Day +REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw >= 1 && $Tw <= 5] MSG Independence Day ########################################################################## # #