Update WHATSNEW in preparation for release.

Avoid warning in "make test"
Add updated "holidays/jewish.rem" courtesy of Nimrod Levy.
2026-04-16 14:28:40 +02:00 · 2025-09-30 14:36:07 -04:00 · 2025-09-30 14:27:48 -04:00 · 2025-09-30 13:24:51 -04:00 · 2025-09-29 19:41:40 -04:00 · 2025-09-29 14:22:10 -04:00
134 changed files with 1889 additions and 976 deletions
--- a/18
+++ b/18
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for remind 06.01.00.
+# Generated by GNU Autoconf 2.72 for remind 06.01.03.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
@@ -601,8 +601,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='06.01.00'
-PACKAGE_STRING='remind 06.01.00'
+PACKAGE_VERSION='06.01.03'
+PACKAGE_STRING='remind 06.01.03'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'

@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-'configure' configures remind 06.01.00 to adapt to many kinds of systems.
+'configure' configures remind 06.01.03 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1320,7 +1320,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 06.01.00:";;
+     short | recursive ) echo "Configuration of remind 06.01.03:";;
   esac
  cat <<\_ACEOF

@@ -1408,7 +1408,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-remind configure 06.01.00
+remind configure 06.01.03
 generated by GNU Autoconf 2.72

 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1871,7 +1871,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by remind $as_me 06.01.00, which was
+It was created by remind $as_me 06.01.03, which was
 generated by GNU Autoconf 2.72.  Invocation command line was

  $ $0$ac_configure_args_raw
@@ -4848,7 +4848,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by remind $as_me 06.01.00, which was
+This file was extended by remind $as_me 06.01.03, which was
 generated by GNU Autoconf 2.72.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -4913,7 +4913,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-remind config.status 06.01.00
+remind config.status 06.01.03
 configured by $0, generated by GNU Autoconf 2.72,
  with options \\"\$ac_cs_config\\"

--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT(remind, 06.01.00, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 06.01.03, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])

 cat <<'EOF'
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -151,7 +151,7 @@
         "$TerminalBackground" "$Thursday" "$TimeSep" "$TimetIs64bit" "$Tm" "$Today" "$TodoFilter"
         "$Tomorrow" "$Tt" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um"
         "$UntimedFirst" "$Use256Colors" "$UseBGVTColors" "$UseTrueColors"
-         "$UseVTColors" "$Uw" "$Uy" "$Was" "$Wednesday")
+         "$UseVTColors" "$Uw" "$Uy" "$WarningLevel" "$Was" "$Wednesday")
   #'(lambda (a b) (> (length a) (length b)))))

 (defconst remind-time-words
@@ -166,12 +166,13 @@
 (defconst remind-builtin-functions
  (sort
   (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
-         "baseyr" "catch" "catcherr" "char" "choose" "coerce" "columns" "const" "current" "date"
+         "baseyr" "catch" "catcherr" "char" "choose" "codepoint" "coerce" "columns" "const" "current" "date"
         "datepart" "datetime" "dawn" "day" "daysinmon" "defined" "dosubst"
         "dusk" "easterdate" "escape" "eval" "evaltrig" "filedate" "filedatetime"
-         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear"
+         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hex"
         "hour" "htmlescape" "htmlstriptags" "iif" "index" "isany" "isconst" "isdst"
-         "isleap" "isomitted" "language" "localtoutc" "lower" "max" "min"
+         "isleap" "isomitted" "language" "localtoutc" "lower" "max"
+         "mbasc" "mbindex" "mbstrlen" "mbsubstr" "min"
         "minsfromutc" "minute" "mon" "monnum" "moondate" "moondatetime"
         "moonphase" "moonrise" "moonrisedir" "moonset" "moonsetdir" "moontime"
         "multitrig" "ndawn" "ndusk" "nonconst" "nonomitted" "now" "ord" "orthodoxeaster"
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,5 +1,77 @@
 CHANGES TO REMIND

+* VERSION 6.1 Patch 3 - 2025-09-30
+
+- IMPROVEMENT: remind: Issue a warning that SCANFROM should be used
+  with ADDOMIT in cases where Remind detects a movable OMIT.
+
+- NEW FEATURE: remind: Add $WarningLevel system variable.  This lets
+  you suppress warnings added by new versions of Remind until you have
+  a chance to update your remind scripts.
+
+- BUG FIX / IMPROVEMENT: include/holidays/*.rem: Simplify the logic
+  used for moving holidays before/after weekends.  Also fixes bugs
+  found in the logic used to move New Year's Day.  Thanks to Nimrod
+  Levy for pointing out the New Year's Day bug.
+
+- IMPROVEMENT: include/holidays/jewish.rem: This file was reworked by
+  Nimrod Levy to simplify logic and optionally add the counting of the
+  Omer.
+
+- BUG FIX: remind: "remind -c" would add an unnecessary blank line for
+  completely-empty calendar rows if you used the "-w,0,0" option.
+  This is now fixed.  Bug pointed out by Tim Chase.
+
+* VERSION 6.1 Patch 2 - 2025-09-19
+
+- BUG FIX: remind: A reminder on a specific fixed date and time that
+  uses the TZ feature could erroneously issue a "Can't compute trigger"
+  error.  This has been fixed.
+
+- CHANGE: remind: The default for --max-expr-complexity is 10,000,000
+  (ten million) instead of unlimited.  This should not affect any
+  real-world Remind scripts.
+
+* VERSION 6.1 Patch 1 - 2025-09-12
+
+- NEW FEATURE: remind: Add the new --max-expr-complexity=n
+  command-line argument.  It is possible to write expressions that use
+  enormous amounts of CPU time, such as the following:
+
+          FSET fib(n) iif(n <= 2, 1, fib(n-1)+fib(n-2))
+          SET a fib(100)
+
+  That will take essentially forever to execute, but will not hit the
+  built-in recursion limit.  Using a command-line argument of
+  --max-expr-complexity=1000000 will terminate evaluation in a few
+  dozen milliseconds on modern hardware, and should not affect
+  realistic reminder scripts.  See the man page for details.
+
+- IMPROVEMENT: remind: Add UTF-8-aware functions to complement the
+  byte-aware functions that could give incorrect results by splitting
+  a UTF-8 character sequence.  The correspondence between old and new
+  functions is:
+
+     NON-UTF-8-AWARE   UTF-8-AWARE
+     ===============   ===========
+     strlen            mbstrlen
+     substr            mbsubstr
+     index             mbindex
+     char              mbchar
+     asc               codepoint
+
+  See the remind(1) man page for details.
+
+- MINOR NEW FEATURE: remind: You can use hexadecimal integer constants
+  like 0xFE12 in expressions.  This is mostly useful for using
+  codepoint() since Unicode code points are often expressed in
+  hexadecimal.
+
+- BUG FIX: remind: When truncating a string when executing DUMPVARS or
+  during debugging of expression evaluation, Remind could sometimes
+  cut the string in the middle of a UTF-8 sequence.  This has been
+  fixed.
+
 * VERSION 6.1 Patch 0 - 2025-09-08

 - MAJOR NEW FEATURE: remind: The TZ keyword lets you specify a time
--- a/examples/tflag.rem
+++ b/examples/tflag.rem
@@ -14,7 +14,7 @@ set bar "█" * c
 set dups r/5
 set bars (bar + "%_") * dups

-set bars substr(bars, 0, strlen(bars)-2)
+set bars mbsubstr(bars, 0, mbstrlen(bars)-2)

 REM SPECIAL COLOR  91 206 250 [bars]
 REM SPECIAL COLOR 245 169 184 [bars]
--- a/include/holidays/ao.rem
+++ b/include/holidays/ao.rem
@@ -6,36 +6,36 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Dia do Ano Novo
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
-REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia do Ano Novo (ponte)
+REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
 OMIT 4 February MSG Dia do Início da Luta Armada de Libertação Nacional
-REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
-REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
+REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia do Carnaval (ponte)
+REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia do Carnaval (ponte)
 OMIT [easterdate($Uy)-47] MSG Dia do Carnaval
-REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia Internacional da Mulher (ponte)
 OMIT 8 March MSG Dia Internacional da Mulher
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
-REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia Internacional da Mulher (ponte)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia da Libertação da África Austral (ponte)
 OMIT 23 March MSG Dia da Libertação da África Austral
-REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia da Libertação da África Austral (ponte)
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT 4 April MSG Dia da Paz e Reconciliação Nacional
-REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT [easterdate($Uy)-2] MSG Sexta-Feira Santa
-REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia Internacional do Trabalhador (ponte)
 OMIT 1 May MSG Dia Internacional do Trabalhador
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
-REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia Internacional do Trabalhador (ponte)
+REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
 OMIT 17 September MSG Dia do Fundador da Nação e do Herói Nacional
-REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia dos Finados (ponte)
 OMIT 2 November MSG Dia dos Finados
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia dos Finados (ponte)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia da Independência Nacional (ponte)
 OMIT 11 November MSG Dia da Independência Nacional
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia da Independência Nacional (ponte)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia de Natal e da Família (ponte)
 OMIT 25 December MSG Dia de Natal e da Família
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Dia de Natal e da Família (ponte)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Dia do Ano Novo (ponte)
--- a/include/holidays/ar.rem
+++ b/include/holidays/ar.rem
@@ -13,26 +13,26 @@ OMIT 2 April MSG Día del Veterano y de los Caidos en la Guerra de Malvinas
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
 OMIT 25 May MSG Día de la Revolución de Mayo
-REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 REM 17 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 20 June MSG Paso a la Inmortalidad del General Don Manuel Belgrano
-REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 9 July MSG Día de la Independencia
-REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
 REM 17 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
 REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
-REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de la Soberanía Nacional (observado)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de la Soberanía Nacional (observado)
 REM 20 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Soberanía Nacional (observado)
-REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
-REM 24 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
+REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de la Soberanía Nacional (observado)
+REM 24 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de la Soberanía Nacional (observado)
 OMIT 8 December MSG Inmaculada Concepción de María
 OMIT 25 December MSG Navidad
--- a/include/holidays/as.rem
+++ b/include/holidays/as.rem
@@ -6,33 +6,33 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
-REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG American Samoa Flag Day (observed)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG American Samoa Flag Day (observed)
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Manu'a Islands Cession Day (observed)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Manu'a Islands Cession Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
 REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 14 February MSG Valentine's Day
--- a/include/holidays/au/act.rem
+++ b/include/holidays/au/act.rem
@@ -10,18 +10,18 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 REM Second Monday in March ADDOMIT SCANFROM -28 MSG Canberra Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Monday 27 May ADDOMIT SCANFROM -28 MSG Reconciliation Day
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)

 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday
--- a/include/holidays/au/nsw.rem
+++ b/include/holidays/au/nsw.rem
@@ -10,16 +10,16 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)

 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday
--- a/include/holidays/au/nt.rem
+++ b/include/holidays/au/nt.rem
@@ -10,18 +10,18 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Picnic Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)

 # Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
--- a/include/holidays/au/qld.rem
+++ b/include/holidays/au/qld.rem
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG The Royal Queensland Show
 REM First Monday in October ADDOMIT SCANFROM -28 MSG King's Birthday
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/au/sa.rem
+++ b/include/holidays/au/sa.rem
@@ -10,19 +10,19 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 REM Second Monday in March ADDOMIT SCANFROM -28 MSG Adelaide Cup Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 26 December MSG Proclamation Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Proclamation Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Proclamation Day (observed)

 # Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
--- a/include/holidays/au/tas.rem
+++ b/include/holidays/au/tas.rem
@@ -12,5 +12,5 @@

 REM Second Monday in March ADDOMIT SCANFROM -28 MSG Eight Hours Day
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
--- a/include/holidays/au/vic.rem
+++ b/include/holidays/au/vic.rem
@@ -10,15 +10,15 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 REM Second Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG Grand Final Day
 REM First Tuesday in November ADDOMIT SCANFROM -28 MSG Melbourne Cup Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/au/wa.rem
+++ b/include/holidays/au/wa.rem
@@ -10,15 +10,15 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/au.rem

-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 REM First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
-REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ANZAC Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ANZAC Day (observed)
 REM First Monday in June ADDOMIT SCANFROM -28 MSG Western Australia Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/ba/bih.rem
+++ b/include/holidays/ba/bih.rem
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Nova godina (preneseno)
 OMIT 6 January MSG Badnji dan (Pravoslavni)
 OMIT 1 March MSG Dan nezavisnosti
 OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
 OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 25 November MSG Dan državnosti
 OMIT 24 December MSG Badnji dan (Katolički)
--- a/include/holidays/ba/brc.rem
+++ b/include/holidays/ba/brc.rem
@@ -10,11 +10,11 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Nova godina (preneseno)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Božić (Pravoslavni) (preneseno)
 OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Božić (Katolički) (preneseno)
--- a/include/holidays/ba/srp.rem
+++ b/include/holidays/ba/srp.rem
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/ba.rem

-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Nova godina (preneseno)
 OMIT 6 January MSG Badnji dan (Pravoslavni)
 OMIT 14 January MSG Pravoslavna Nova godina
 OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
 OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini
 OMIT 24 December MSG Badnji dan (Katolički)
--- a/include/holidays/bb.rem
+++ b/include/holidays/bb.rem
@@ -6,23 +6,23 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 21 January MSG Errol Barrow Day
-REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
+REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Errol Barrow Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 28 April MSG National Heroes Day
-REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Heroes Day (observed)
 OMIT 1 May MSG May Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG May Day (observed)
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 1 August MSG Emancipation Day
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Kadooment Day
-REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
-REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Emancipation Day (observed)
+REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Emancipation Day (observed)
 OMIT 30 November MSG Independence Day
-REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/bf.rem
+++ b/include/holidays/bf.rem
@@ -6,24 +6,24 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 3 January MSG Revolution Day
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Revolution Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 5 August MSG Independence Day
-REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Assumption Day (observed)
 OMIT 31 October MSG Martyrs' Day
 OMIT 1 November MSG All Saints' Day
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Martyrs' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG All Saints' Day (observed)
 OMIT 11 December MSG Proclamation of Independence Day
-REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Proclamation of Independence Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
--- a/include/holidays/bi.rem
+++ b/include/holidays/bi.rem
@@ -6,25 +6,25 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 5 February MSG Unity Day
-REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
+REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Unity Day (observed)
 OMIT 6 April MSG President Ntaryamira Day
-REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG President Ntaryamira Day (observed)
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 8 June MSG President Nkurunziza Day
-REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG President Nkurunziza Day (observed)
 OMIT 1 July MSG Independence Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Assumption Day (observed)
 OMIT 13 October MSG Prince Louis Rwagasore Day
-REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Prince Louis Rwagasore Day (observed)
 OMIT 21 October MSG President Ndadaye's Day
-REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
+REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG President Ndadaye's Day (observed)
 OMIT 1 November MSG All Saints' Day
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG All Saints' Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
--- a/include/holidays/bn.rem
+++ b/include/holidays/bn.rem
@@ -6,17 +6,17 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Awal Tahun Masihi
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG Awal Tahun Masihi (diperhatikan)
 OMIT 23 February MSG Hari Kebangsaan
-REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
-REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG Hari Kebangsaan (diperhatikan)
 OMIT 31 May MSG Hari Angkatan Bersenjata Diraja Brunei
-REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
 OMIT 15 July MSG Hari Keputeraan KDYMM Sultan Brunei
-REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
 OMIT 25 December MSG Hari Natal
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 5] MSG Hari Natal (diperhatikan)
--- a/include/holidays/bo.rem
+++ b/include/holidays/bo.rem
@@ -13,20 +13,20 @@
 # [$SysInclude]/holidays/bo/

 OMIT 1 January MSG Año Nuevo
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Año Nuevo (observado)
 OMIT 22 January MSG Día de la Creación del Estado Plurinacional de Bolivia
-REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día del Trabajo (observado)
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 OMIT 21 June MSG Año Nuevo Aymara Amazónico
-REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Año Nuevo Aymara Amazónico (observado)
 OMIT 6 August MSG Día de la Independencia de Bolivia
-REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de la Independencia de Bolivia (observado)
 OMIT 17 October MSG Día de la Dignidad Nacional
 OMIT 2 November MSG Día de Todos los Difuntos
 OMIT 25 December MSG Navidad
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Navidad (observado)
--- a/include/holidays/bs.rem
+++ b/include/holidays/bs.rem
@@ -6,21 +6,21 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 10 January MSG Majority Rule Day
-REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
-REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Majority Rule Day (observed)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Majority Rule Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 REM First Friday in June ADDOMIT SCANFROM -28 MSG Randol Fawkes Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 10 July MSG Independence Day
-REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
-REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
+REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Independence Day (observed)
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/bw.rem
+++ b/include/holidays/bw.rem
@@ -7,25 +7,25 @@

 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day Holiday
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Labour Day Holiday
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 1 July MSG Sir Seretse Khama Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Sir Seretse Khama Day (observed)
 REM Third Monday in July ADDOMIT SCANFROM -28 MSG President's Day
 REM Tuesday 16 July ADDOMIT SCANFROM -28 MSG President's Day Holiday
 OMIT 30 September MSG Botswana Day
 OMIT 1 October MSG Botswana Day Holiday
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Botswana Day Holiday (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Botswana Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day Holiday
--- a/include/holidays/bz.rem
+++ b/include/holidays/bz.rem
@@ -6,38 +6,38 @@
 # See important caveats in the README file in this directory.

 REM 1 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG New Year's Day (observed)
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM 15 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG George Price Day (observed)
-REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
-REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
-REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
-REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG George Price Day (observed)
+REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG National Heroes and Benefactors Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG National Heroes and Benefactors Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG National Heroes and Benefactors Day (observed)
 REM 9 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG National Heroes and Benefactors Day (observed)
-REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
-REM 12 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
+REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Heroes and Benefactors Day (observed)
+REM 12 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG National Heroes and Benefactors Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Labour Day (observed)
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
-REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
-REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG Emancipation Day (observed)
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Emancipation Day (observed)
+REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Emancipation Day (observed)
 REM 1 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Emancipation Day (observed)
-REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
-REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Emancipation Day (observed)
+REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Emancipation Day (observed)
 REM 10 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Saint George's Caye Day (observed)
-REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Saint George's Caye Day (observed)
 REM 21 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Independence Day (observed)
-REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
-REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG Indigenous Peoples' Resistance Day (observed)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Indigenous Peoples' Resistance Day (observed)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Indigenous Peoples' Resistance Day (observed)
 REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Indigenous Peoples' Resistance Day (observed)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Indigenous Peoples' Resistance Day (observed)
 REM 19 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Garifuna Settlement Day (observed)
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Garifuna Settlement Day (observed)
 OMIT 25 December MSG Christmas Day
 REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Boxing Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
--- a/include/holidays/ca.rem
+++ b/include/holidays/ca.rem
@@ -13,25 +13,25 @@
 # [$SysInclude]/holidays/ca/

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG Victoria Day
 OMIT 1 July MSG Canada Day
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Canada Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Canada Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 30 September MSG National Day for Truth and Reconciliation
-REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
+REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Day for Truth and Reconciliation (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG National Day for Truth and Reconciliation (observed)
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Thanksgiving Day
 OMIT 11 November MSG Remembrance Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
-REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Remembrance Day (observed)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Remembrance Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/ca/qc.rem
+++ b/include/holidays/ca/qc.rem
@@ -12,7 +12,7 @@

 REM Monday 18 May ADDOMIT SCANFROM -28 MSG National Patriots' Day
 OMIT 24 June MSG Saint Jean Baptiste Day
-REM 25 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 24)) == 0] MSG Saint Jean Baptiste Day (observed)
+REM 25 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Saint Jean Baptiste Day (observed)

 # Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday
--- a/include/holidays/cl.rem
+++ b/include/holidays/cl.rem
@@ -19,26 +19,26 @@ OMIT [easterdate($Uy)-1] MSG Sábado Santo
 OMIT 1 May MSG Día Nacional del Trabajo
 OMIT 21 May MSG Día de las Glorias Navales
 REM [datepart(soleq(1, $U-28))] ADDOMIT MSG Día Nacional de los Pueblos Indígenas
-REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo
-REM 27 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo
-REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo
+REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG San Pedro y San Pablo
+REM 27 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG San Pedro y San Pablo
+REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG San Pedro y San Pablo
 REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG San Pedro y San Pablo
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG San Pedro y San Pablo
 OMIT 16 July MSG Virgen del Carmen
 OMIT 15 August MSG Asunción de la Virgen
 REM 17 September ADDOMIT SCANFROM -28 SATISFY [isany($Tw, 1, 5)] MSG Fiestas Patrias
 OMIT 18 September MSG Día de la Independencia
 OMIT 19 September MSG Día de las Glorias del Ejército
 REM 20 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 5] MSG Fiestas Patrias
-REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Encuentro de dos Mundos
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Encuentro de dos Mundos
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Encuentro de dos Mundos
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+3) == 4] MSG Día del Encuentro de dos Mundos
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día del Encuentro de dos Mundos
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día del Encuentro de dos Mundos
 REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Encuentro de dos Mundos
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Encuentro de dos Mundos
-REM 27 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día del Encuentro de dos Mundos
+REM 27 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+4) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 REM 31 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 1 November MSG Día de Todos los Santos
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 8 December MSG La Inmaculada Concepción
 OMIT 25 December MSG Navidad

--- a/include/holidays/co.rem
+++ b/include/holidays/co.rem
@@ -7,79 +7,79 @@

 OMIT 1 January MSG Año Nuevo
 REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de los Reyes Magos (observado)
-REM 7 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 0] MSG Día de los Reyes Magos (observado)
-REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 6] MSG Día de los Reyes Magos (observado)
-REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Reyes Magos (observado)
-REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Reyes Magos (observado)
-REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Reyes Magos (observado)
-REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Reyes Magos (observado)
+REM 7 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de los Reyes Magos (observado)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de los Reyes Magos (observado)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de los Reyes Magos (observado)
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de los Reyes Magos (observado)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Día de los Reyes Magos (observado)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Día de los Reyes Magos (observado)
 REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de San José (observado)
-REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Día de San José (observado)
-REM 21 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 6] MSG Día de San José (observado)
-REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 5] MSG Día de San José (observado)
-REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 4] MSG Día de San José (observado)
-REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 3] MSG Día de San José (observado)
-REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG Día de San José (observado)
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de San José (observado)
+REM 21 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de San José (observado)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de San José (observado)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de San José (observado)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Día de San José (observado)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Día de San José (observado)
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
 REM 9 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Ascensión del señor (observado)
-REM 10 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 0] MSG Ascensión del señor (observado)
-REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 6] MSG Ascensión del señor (observado)
-REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 5] MSG Ascensión del señor (observado)
-REM 13 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 4] MSG Ascensión del señor (observado)
-REM 14 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 3] MSG Ascensión del señor (observado)
-REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 2] MSG Ascensión del señor (observado)
+REM 10 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Ascensión del señor (observado)
+REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Ascensión del señor (observado)
+REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Ascensión del señor (observado)
+REM 13 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Ascensión del señor (observado)
+REM 14 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Ascensión del señor (observado)
+REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Ascensión del señor (observado)
 REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Corpus Christi (observado)
-REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Corpus Christi (observado)
-REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 6] MSG Corpus Christi (observado)
-REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 5] MSG Corpus Christi (observado)
-REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 4] MSG Corpus Christi (observado)
-REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 3] MSG Corpus Christi (observado)
-REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 2] MSG Corpus Christi (observado)
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Corpus Christi (observado)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Corpus Christi (observado)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Corpus Christi (observado)
+REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Corpus Christi (observado)
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Corpus Christi (observado)
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Corpus Christi (observado)
 REM 7 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Sagrado Corazón (observado)
-REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 0] MSG Sagrado Corazón (observado)
-REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 6] MSG Sagrado Corazón (observado)
-REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 5] MSG Sagrado Corazón (observado)
-REM 11 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 4] MSG Sagrado Corazón (observado)
-REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 3] MSG Sagrado Corazón (observado)
-REM 13 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
+REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Sagrado Corazón (observado)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Sagrado Corazón (observado)
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Sagrado Corazón (observado)
+REM 11 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Sagrado Corazón (observado)
+REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Sagrado Corazón (observado)
+REM 13 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Sagrado Corazón (observado)
 REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG San Pedro y San Pablo (observado)
-REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG San Pedro y San Pablo (observado)
-REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 6] MSG San Pedro y San Pablo (observado)
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo (observado)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo (observado)
-REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo (observado)
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo (observado)
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG San Pedro y San Pablo (observado)
+REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG San Pedro y San Pablo (observado)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG San Pedro y San Pablo (observado)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG San Pedro y San Pablo (observado)
+REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG San Pedro y San Pablo (observado)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG San Pedro y San Pablo (observado)
 OMIT 20 July MSG Día de la Independencia
 OMIT 7 August MSG Batalla de Boyacá
 REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG La Asunción (observado)
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG La Asunción (observado)
-REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG La Asunción (observado)
-REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG La Asunción (observado)
-REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG La Asunción (observado)
-REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG La Asunción (observado)
-REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG La Asunción (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG La Asunción (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG La Asunción (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG La Asunción (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG La Asunción (observado)
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG La Asunción (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG La Asunción (observado)
 REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Raza (observado)
-REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Día de la Raza (observado)
-REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 6] MSG Día de la Raza (observado)
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Raza (observado)
-REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Raza (observado)
-REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Raza (observado)
-REM 18 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Raza (observado)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de la Raza (observado)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de la Raza (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de la Raza (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de la Raza (observado)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Día de la Raza (observado)
+REM 18 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Día de la Raza (observado)
 REM 1 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Todos los Santos (observado)
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG Día de Todos los Santos (observado)
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 6] MSG Día de Todos los Santos (observado)
-REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 5] MSG Día de Todos los Santos (observado)
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 4] MSG Día de Todos los Santos (observado)
-REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 3] MSG Día de Todos los Santos (observado)
-REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 2] MSG Día de Todos los Santos (observado)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de Todos los Santos (observado)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de Todos los Santos (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de Todos los Santos (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de Todos los Santos (observado)
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Día de Todos los Santos (observado)
+REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Día de Todos los Santos (observado)
 REM 11 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Independencia de Cartagena (observado)
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Independencia de Cartagena (observado)
-REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Independencia de Cartagena (observado)
-REM 14 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 5] MSG Independencia de Cartagena (observado)
-REM 15 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Independencia de Cartagena (observado)
-REM 16 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 3] MSG Independencia de Cartagena (observado)
-REM 17 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Independencia de Cartagena (observado)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independencia de Cartagena (observado)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Independencia de Cartagena (observado)
+REM 14 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Independencia de Cartagena (observado)
+REM 15 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Independencia de Cartagena (observado)
+REM 16 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-5) == 3] MSG Independencia de Cartagena (observado)
+REM 17 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-6) == 2] MSG Independencia de Cartagena (observado)
 OMIT 8 December MSG La Inmaculada Concepción
 OMIT 25 December MSG Navidad
--- a/include/holidays/cr.rem
+++ b/include/holidays/cr.rem
@@ -6,30 +6,30 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Año Nuevo
-REM 9 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 3] MSG Día de Juan Santamaría (observado)
-REM 10 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 2] MSG Día de Juan Santamaría (observado)
+REM 9 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de Juan Santamaría (observado)
+REM 10 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de Juan Santamaría (observado)
 REM 11 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-REM 12 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 0] MSG Día de Juan Santamaría (observado)
+REM 12 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 13 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 6] MSG Día de Juan Santamaría (observado)
-REM 14 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 5] MSG Día de Juan Santamaría (observado)
-REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG Día de Juan Santamaría (observado)
+REM 13 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de Juan Santamaría (observado)
+REM 14 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de Juan Santamaría (observado)
+REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de Juan Santamaría (observado)
 OMIT 1 May MSG Día Internacional del Trabajo
-REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 25 July ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 27 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 28 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG Día de la Madre (observado)
-REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG Día de la Madre (observado)
+REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 27 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 28 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de la Madre (observado)
+REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de la Madre (observado)
 REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Madre (observado)
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Día de la Madre (observado)
-REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG Día de la Madre (observado)
-REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG Día de la Madre (observado)
-REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG Día de la Madre (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de la Madre (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día de la Madre (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de la Madre (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de la Madre (observado)
 OMIT 15 September MSG Día de la Independencia
 OMIT 25 December MSG Navidad

--- a/include/holidays/cu.rem
+++ b/include/holidays/cu.rem
@@ -9,11 +9,11 @@ OMIT 1 January MSG Triunfo de la Revolución
 OMIT 2 January MSG Día de la Victoria
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día Internacional de los Trabajadores
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día Internacional de los Trabajadores (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día Internacional de los Trabajadores (observado)
 OMIT 25 July MSG Conmemoración del asalto a Moncada
 OMIT 26 July MSG Día de la Rebeldía Nacional
 OMIT 27 July MSG Conmemoración del asalto a Moncada
 OMIT 10 October MSG Inicio de las Guerras de Independencia
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Inicio de las Guerras de Independencia (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Inicio de las Guerras de Independencia (observado)
 OMIT 25 December MSG Día de Navidad
 OMIT 31 December MSG Fiesta de Fin de Año
--- a/include/holidays/dm.rem
+++ b/include/holidays/dm.rem
@@ -6,7 +6,7 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-48] MSG Carnival Monday
 OMIT [easterdate($Uy)-47] MSG Carnival Tuesday
 OMIT [easterdate($Uy)-2] MSG Good Friday
@@ -16,9 +16,9 @@ OMIT [easterdate($Uy)+50] MSG Whit Monday
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 OMIT 3 November MSG Independence Day
 OMIT 4 November MSG National Day of Community Service
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independence Day (observed)
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG National Day of Community Service (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Day of Community Service (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/do.rem
+++ b/include/holidays/do.rem
@@ -6,31 +6,31 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Año Nuevo
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Santos Reyes
-REM 5 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Santos Reyes
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de los Santos Reyes
+REM 5 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de los Santos Reyes
 REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de los Santos Reyes
-REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Santos Reyes
-REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Santos Reyes
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de los Santos Reyes
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de los Santos Reyes
 OMIT 21 January MSG Día de la Altagracia
-REM 24 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 3] MSG Día de Duarte
-REM 25 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 2] MSG Día de Duarte
+REM 24 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de Duarte
+REM 25 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de Duarte
 REM 26 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de Duarte
-REM 29 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 5] MSG Día de Duarte
-REM 30 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 4] MSG Día de Duarte
+REM 29 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de Duarte
+REM 30 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de Duarte
 OMIT 27 February MSG Día de Independencia
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo
-REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día del Trabajo
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día del Trabajo
 REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Día del Trabajo
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo
-REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 5] MSG Día del Trabajo
-REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día del Trabajo
+REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día del Trabajo
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día del Trabajo
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 OMIT 16 August MSG Día de la Restauración
 OMIT 24 September MSG Día de las Mercedes
-REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 3] MSG Día de la Constitución
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 2] MSG Día de la Constitución
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día de la Constitución
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de la Constitución
 REM 6 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Constitución
-REM 9 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 5] MSG Día de la Constitución
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 4] MSG Día de la Constitución
+REM 9 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día de la Constitución
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día de la Constitución
 OMIT 25 December MSG Día de Navidad
--- a/include/holidays/ec.rem
+++ b/include/holidays/ec.rem
@@ -6,43 +6,43 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Año Nuevo
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Año Nuevo (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo (observado)
-REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Día del Trabajo (observado)
 OMIT 1 May MSG Día del Trabajo
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo (observado)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo (observado)
-REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 2] MSG Batalla de Pichincha (observado)
-REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 6] MSG Batalla de Pichincha (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Día del Trabajo (observado)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Día del Trabajo (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Batalla de Pichincha (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Batalla de Pichincha (observado)
 OMIT 24 May MSG Batalla de Pichincha
-REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 0] MSG Batalla de Pichincha (observado)
-REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 4] MSG Batalla de Pichincha (observado)
-REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 3] MSG Batalla de Pichincha (observado)
-REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 2] MSG Primer Grito de Independencia (observado)
-REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 6] MSG Primer Grito de Independencia (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Batalla de Pichincha (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Batalla de Pichincha (observado)
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Batalla de Pichincha (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Primer Grito de Independencia (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Primer Grito de Independencia (observado)
 OMIT 10 August MSG Primer Grito de Independencia
-REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 0] MSG Primer Grito de Independencia (observado)
-REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 4] MSG Primer Grito de Independencia (observado)
-REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 3] MSG Primer Grito de Independencia (observado)
-REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 2] MSG Independencia de Guayaquil (observado)
-REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 6] MSG Independencia de Guayaquil (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Primer Grito de Independencia (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Primer Grito de Independencia (observado)
+REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Primer Grito de Independencia (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Independencia de Guayaquil (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independencia de Guayaquil (observado)
 OMIT 9 October MSG Independencia de Guayaquil
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 0] MSG Independencia de Guayaquil (observado)
-REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 4] MSG Independencia de Guayaquil (observado)
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 3] MSG Independencia de Guayaquil (observado)
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Día de los Difuntos (observado)
-REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 6] MSG Día de los Difuntos (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independencia de Guayaquil (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Independencia de Guayaquil (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Independencia de Guayaquil (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día de los Difuntos (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Día de los Difuntos (observado)
 OMIT 2 November MSG Día de los Difuntos
 OMIT 3 November MSG Independencia de Cuenca
-REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 3] MSG Día de los Difuntos (observado)
-REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independencia de Cuenca (observado)
-REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 4] MSG Independencia de Cuenca (observado)
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 3] MSG Independencia de Cuenca (observado)
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Día de Navidad (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independencia de Cuenca (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG Independencia de Cuenca (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Día de los Difuntos (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 3] MSG Independencia de Cuenca (observado)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Día de Navidad (observado)
 OMIT 25 December MSG Día de Navidad
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Día de Navidad (observado)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Año Nuevo (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día de Navidad (observado)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Año Nuevo (observado)
--- a/include/holidays/es/an.rem
+++ b/include/holidays/es/an.rem
@@ -11,7 +11,7 @@
 # also SYSINCLUDE holidays/es.rem

 REM 28 February ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Andalucia
-REM 29 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 28)) == 0] MSG Lunes siguiente a Día de Andalucia
+REM 29 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Día de Andalucia
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/ar.rem
+++ b/include/holidays/es/ar.rem
@@ -12,6 +12,6 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de San Jorge
-REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Día de San Jorge
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Día de San Jorge
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/as.rem
+++ b/include/holidays/es/as.rem
@@ -12,6 +12,6 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 8 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Asturias
-REM 9 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 8)) == 0] MSG Lunes siguiente a Día de Asturias
+REM 9 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Día de Asturias
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/cl.rem
+++ b/include/holidays/es/cl.rem
@@ -12,6 +12,6 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de Castilla y León
-REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/cn.rem
+++ b/include/holidays/es/cn.rem
@@ -12,4 +12,4 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Canarias
-REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Lunes siguiente a Día de Canarias
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Día de Canarias
--- a/include/holidays/es/ex.rem
+++ b/include/holidays/es/ex.rem
@@ -13,4 +13,4 @@
 OMIT [easterdate($Uy)-47] MSG Martes de Carnaval
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/mc.rem
+++ b/include/holidays/es/mc.rem
@@ -11,7 +11,7 @@
 # also SYSINCLUDE holidays/es.rem

 REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a San José
-REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Lunes siguiente a San José
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a San José
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/md.rem
+++ b/include/holidays/es/md.rem
@@ -12,5 +12,5 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 2 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
 OMIT 25 July MSG Santiago Apóstol
--- a/include/holidays/es/ml.rem
+++ b/include/holidays/es/ml.rem
@@ -12,4 +12,4 @@

 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Inmaculada Concepción
--- a/include/holidays/es/ri.rem
+++ b/include/holidays/es/ri.rem
@@ -13,4 +13,4 @@
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)+1] MSG Lunes de Pascua
 REM 9 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de La Rioja
-REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 9)) == 0] MSG Lunes siguiente a Día de La Rioja
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lunes siguiente a Día de La Rioja
--- a/include/holidays/gb.rem
+++ b/include/holidays/gb.rem
@@ -13,15 +13,15 @@
 # [$SysInclude]/holidays/gb/

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
 REM Second Sunday in November MSG Remembrance Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/gb/nir.rem
+++ b/include/holidays/gb/nir.rem
@@ -11,10 +11,10 @@
 # also SYSINCLUDE holidays/gb.rem

 OMIT 17 March MSG Saint Patrick's Day
-REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
-REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Saint Patrick's Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Saint Patrick's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 12 July MSG Battle of the Boyne
-REM 13 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
-REM 14 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
+REM 13 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Battle of the Boyne (observed)
+REM 14 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Battle of the Boyne (observed)
 REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
--- a/include/holidays/gb/sct.rem
+++ b/include/holidays/gb/sct.rem
@@ -11,10 +11,10 @@
 # also SYSINCLUDE holidays/gb.rem

 OMIT 2 January MSG New Year Holiday
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year Holiday (observed)
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Summer Bank Holiday
 OMIT 30 November MSG Saint Andrew's Day
-REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
-REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Saint Andrew's Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Saint Andrew's Day (observed)
--- a/include/holidays/gh.rem
+++ b/include/holidays/gh.rem
@@ -6,29 +6,29 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT 7 January MSG Constitution Day
-REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Constitution Day (observed)
-REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 6] MSG Constitution Day (observed)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Constitution Day (observed)
 OMIT 6 March MSG Independence Day
-REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 0] MSG Independence Day (observed)
-REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 6] MSG Independence Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Independence Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG May Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG May Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG May Day (observed)
 OMIT 4 August MSG Founders' Day
-REM 5 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 0] MSG Founders' Day (observed)
-REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 6] MSG Founders' Day (observed)
+REM 5 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Founders' Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Founders' Day (observed)
 OMIT 21 September MSG Kwame Nkrumah Memorial Day
-REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Kwame Nkrumah Memorial Day (observed)
-REM 23 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 6] MSG Kwame Nkrumah Memorial Day (observed)
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Kwame Nkrumah Memorial Day (observed)
+REM 23 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Kwame Nkrumah Memorial Day (observed)
 REM First Friday in December ADDOMIT SCANFROM -28 MSG Farmer's Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/gt.rem
+++ b/include/holidays/gt.rem
@@ -10,13 +10,13 @@ OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT [easterdate($Uy)-1] MSG Sabado Santo
 OMIT 1 May MSG Día del Trabajo
-REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 3] MSG Día del Ejército
-REM 29 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 2] MSG Día del Ejército
+REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG Día del Ejército
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG Día del Ejército
 REM 30 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día del Ejército
-REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 0] MSG Día del Ejército
-REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 6] MSG Día del Ejército
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 5] MSG Día del Ejército
-REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 4] MSG Día del Ejército
+REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Día del Ejército
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Día del Ejército
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG Día del Ejército
+REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG Día del Ejército
 OMIT 15 August MSG Día de la Asunción
 OMIT 15 September MSG Día de la Independencia
 OMIT 20 October MSG Día de la Revolución
--- a/include/holidays/gu.rem
+++ b/include/holidays/gu.rem
@@ -6,30 +6,30 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
 REM First Monday in March ADDOMIT SCANFROM -28 MSG Guam Discovery Day
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 21 July MSG Liberation Day (Guam)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
 OMIT 2 November MSG All Souls' Day
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
 OMIT 8 December MSG Lady of Camarin Day
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 14 February MSG Valentine's Day
--- a/include/holidays/im.rem
+++ b/include/holidays/im.rem
@@ -6,21 +6,21 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
 REM First Friday in June ADDOMIT SCANFROM -28 MSG TT Bank Holiday
 REM 5 July ADDOMIT SCANFROM -28 SATISFY [$Tw != 6 && $Tw != 0] MSG Tynwald Day
-REM 6 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 5)) == 0] MSG Tynwald Day
-REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 5)) == 6] MSG Tynwald Day
+REM 6 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Tynwald Day
+REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Tynwald Day
 REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
 REM Second Sunday in November MSG Remembrance Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/jewish.rem
+++ b/include/holidays/jewish.rem
@@ -1,117 +1,117 @@
-# Major Jewish Holidays
-# SPDX-License-Identifier: GPL-2.0-only
-
 # Save variables and functions that we will mess with
-PUSH-VARS InIsrael IncludeIsraeliHolidays Reform
-PUSH-FUNCS _chan _h2 _PastSat _BackTwoFri _BackTwoSat
+PUSH-VARS InIsrael IncludeIsraeliHolidays Reform IncludeOmer IncludeOmerCal SunCal
+PUSH-FUNCS _chan _h2 _h2I _YZ _PastSat _BackTwoSat

-# Set the variable InIsrael to 1 if you live in Israel.  Otherwise,
-# you get the Diaspora versions of Jewish holidays
 SET InIsrael value("InIsrael", 0)
-
-# Set this if you want to include holidays that are not really
-# Jewish religious holidays, but simply Israeli holidays
-SET IncludeIsraeliHolidays value("IncludeIsraeliHolidays", 0)
-
-# Set the variable Reform to 1 if you want the Reform version of the
-# Jewish calendar.  Otherwise, you get the traditional version
+SET IncludeIsraeliHolidays value("IncludeIsraeliHolidays", 1)
 SET Reform value("Reform", 0)
+SET IncludeOmer value("IncludeOmer", 1)
+#include Omer in calendar mode
+SET IncludeOmerCal value("IncludeOmerCal", 0)
+#include Hebrew date on Sundays in calendar mode
+SET SunCal value("SunCal", 1)

 # Convenient function definition to save typing
 FSET _h2(x, y) HEBDATE(x, y, $U-7)
+FSET _h2I(x,y) IIF(InIsrael, _h2(x,y), _h2(x,y)+1)
 FSET _PastSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)+1)
-FSET _BackTwoFri(x, y) IIF(WKDAYNUM(_h2(x,y))!=5, _h2(x,y), _h2(x,y)-2)
 FSET _BackTwoSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)-2)

-REM [hebdate(1,  "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Rosh_Hashanah" MSG Rosh Hashana 1

-# No RH-2 or Tzom Gedalia in Reform
-IF !Reform
-   REM [hebdate(2,  "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Rosh_Hashanah" MSG Rosh Hashana 2
-   REM [_PastSat(3,  "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Fast_of_Gedalia" MSG Tzom Gedalia
+IF SunCal
+    REM Sun CAL %"[hebday($T)] [hebmon($T)]%"
 ENDIF

-REM [hebdate(10, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Yom_Kippur" MSG Yom Kippur
-REM [hebdate(15, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Sukkot" MSG Sukkot 1
-
+REM [hebdate(1, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Rosh_Hashanah" MSG %"Rosh Hashana 1%" %b
+IF !Reform
+    REM [hebdate(2,  "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Rosh_Hashanah" MSG %"Rosh Hashana 2%" %b
+    REM [_PastSat(3,  "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Fast_of_Gedalia" MSG %"Tzom Gedalia%" %b
+ENDIF
+REM [hebdate(10, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Yom_Kippur" MSG %"Yom Kippur%" %b
+REM [hebdate(15, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Sukkot" MSG %"Sukkot 1%" %b
 IF !InIsrael
-   REM [hebdate(16, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Sukkot" MSG Sukkot 2
+    REM [hebdate(16, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Sukkot" MSG %"Sukkot 2%" %b
 ENDIF
+REM [hebdate(21, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Hoshana_Rabbah" MSG %"Hoshana Rabba%" %b
+REM [hebdate(22, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Shemini_Atzeret" MSG %"Shemini Atzeret%" %b
+REM [_h2I(22, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Simchat_Torah" MSG %"Simchat Torah%" %b

-REM [hebdate(21, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Hoshana_Rabbah" MSG Hoshana Rabba
-REM [hebdate(22, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Shemini_Atzeret" MSG Shemini Atzeret
+# If the reminder has expired, $T can be zero, hence the
+# ($T || $U) below
+REM [hebdate(25, "Kislev",$U-9)] through [hebdate(25, "Kislev",$U-9)+7] \
+    INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah [($T || $U) - hebdate(25,"Kislev",$U-9) + 1]

-IF InIsrael
-   REM [hebdate(22, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Simchat_Torah" MSG Simchat Torah
-ELSE
-   REM [hebdate(23, "Tishrey")] INFO "Url: https://en.wikipedia.org/wiki/Simchat_Torah" MSG Simchat Torah
-ENDIF
-
-# Because Kislev can change length, we must be more careful about Chanukah
-FSET _chan(x) HEBDATE(24, "Kislev", $U-9)+x
-REM [_chan(1)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 1
-REM [_chan(2)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 2
-REM [_chan(3)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 3
-REM [_chan(4)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 4
-REM [_chan(5)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 5
-REM [_chan(6)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 6
-REM [_chan(7)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 7
-REM [_chan(8)] INFO "Url: https://en.wikipedia.org/wiki/Hanukkah" MSG Chanukah 8
-
-# Not sure about Reform's position on the next one.
 IF !Reform
-# 10 Tevet will never be a Saturday, so whether or not to
-# move it is moot.  (Thanks to Art Werschulz.)
-   REM [hebdate(10, "Tevet")] INFO "Url: https://en.wikipedia.org/wiki/Tenth_of_Tevet" MSG Tzom Tevet
+    REM [hebdate(10, "Tevet")] INFO "Url: https://en.wikipedia.org/wiki/Tenth_of_Tevet" MSG %"Tzom Tevet%" %b
 ENDIF

-REM [hebdate(15, "Shvat")] INFO "Url: https://en.wikipedia.org/wiki/Tu_BiShvat" MSG Tu B'Shvat
-REM [hebdate(14, "Adar A")] INFO "Url: https://en.wikipedia.org/wiki/Purim#Purim_Katan" MSG Purim Katan
+REM [hebdate(15, "Shvat")] INFO "Url: https://en.wikipedia.org/wiki/Tu_BiShvat" MSG %"Tu B'Shvat%" %b

+REM [hebdate(14, "Adar A")] INFO "Url: https://en.wikipedia.org/wiki/Purim#Purim_Katan" MSG %"Purim Katan%" %b
+REM [hebdate(15, "Adar A")] INFO "Url: https://en.wikipedia.org/wiki/Purim#Shushan_Purim" MSG %"Shushan Purim Katan%" %b
 # If Purim is on Sunday, then Fast of Esther is 11 Adar.
-IF WKDAYNUM(_h2(13, "Adar")) != 6
-   REM [_h2(13, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Fast_of_Esther" MSG Fast of Esther
-ELSE
-   REM [_h2(11, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Fast_of_Esther" MSG Fast of Esther
-ENDIF
-REM [hebdate(14, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Purim" MSG Purim
-REM [hebdate(15, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG Pesach
+REM [_BackTwoSat(13, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Fast_of_Esther" MSG %"Fast of Esther%" %b
+REM [hebdate(14, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Purim" MSG %"Purim%" %b
+REM [hebdate(15, "Adar")] INFO "Url: https://en.wikipedia.org/wiki/Purim#Shushan_Purim" MSG %"Shushan Purim%" %b

+
+REM [hebdate(15, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG %"Pesach%" %b
 IF !InIsrael
-   REM [hebdate(16, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG Pesach 2
+    REM [hebdate(16, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG %"Pesach 2
 ENDIF
-
-REM [hebdate(21, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG Pesach 7
-
+REM [hebdate(21, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG %"Pesach 7
 IF !InIsrael && !Reform
-   REM [hebdate(22, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG Pesach 8
+    REM [hebdate(22, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Passover" MSG %"Pesach 8
 ENDIF

-REM [hebdate(27, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaShoah" MSG Yom HaShoah
+REM [hebdate(27, "Nisan")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaShoah" MSG %"Yom HaShoah%" %b

 IF IncludeIsraeliHolidays
-    REM [_BackTwoFri(4,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaZikaron" MSG Yom HaZikaron
-    REM [_BackTwoSat(5,  "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Independence_Day_(Israel)" MSG Yom Ha'atzmaut
-    REM [hebdate(28, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Jerusalem_Day" MSG Yom Yerushalayim
+    FSET _YZ(x, y) IIF(WKDAYNUM(_h2(x,y))==0, _h2(x,y)+1,\
+                        WKDAYNUM(_h2(x,y))==4, _h2(x,y)-1,\
+                        WKDAYNUM(_h2(x,y))==5, _h2(x,y)-2,\
+                        _h2(x,y))
+    SET YZ _YZ(4, "Iyar")
+    REM [YZ] INFO "Url: https://en.wikipedia.org/wiki/Yom_HaZikaron" MSG %"Yom HaZikaron%" %b
+    REM [YZ+1] INFO "Url: https://en.wikipedia.org/wiki/Independence_Day_(Israel)" MSG %"Yom Ha'atzmaut%" %b
+    REM [hebdate(28, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Jerusalem_Day" MSG %"Yom Yerushalayim%" %b
 ENDIF

-# Not sure about Reform's position on Lag B'Omer
 IF !Reform
-   REM [hebdate(18, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Lag_BaOmer" MSG Lag B'Omer
+    REM [hebdate(18, "Iyar")] INFO "Url: https://en.wikipedia.org/wiki/Lag_BaOmer" MSG %"Lag B'Omer%" %b
 ENDIF

-REM [hebdate(6,  "Sivan")] INFO "Url: https://en.wikipedia.org/wiki/Shavuot" MSG Shavuot
+REM [hebdate(6,  "Sivan")] INFO "Url: https://en.wikipedia.org/wiki/Shavuot" MSG %"Shavuot%" %b

 IF !InIsrael && !Reform
-   REM [hebdate(7, "Sivan")] INFO "Url: https://en.wikipedia.org/wiki/Shavuot" MSG Shavuot 2
+    REM [hebdate(7, "Sivan")] INFO "Url: https://en.wikipedia.org/wiki/Shavuot" MSG %"Shavuot 2%" %b
 ENDIF

-# Fairly sure Reform Jews don't observe the next two
 IF !Reform
-# Tzom Tamuz and Tish'a B'Av are moved to Sunday if they normally
-# fall on a Saturday
-   REM [_PastSat(17, "Tamuz")] INFO "Url: https://en.wikipedia.org/wiki/Seventeenth_of_Tammuz" MSG Tzom Tammuz
-   REM [_PastSat(9,  "Av")] INFO "Url: https://en.wikipedia.org/wiki/Tisha_B%27Av" MSG Tish'a B'Av
+    # Tzom Tamuz and Tish'a B'Av are moved to Sunday if they normally
+    # fall on a Saturday
+    REM [_PastSat(17, "Tamuz")] INFO "Url: https://en.wikipedia.org/wiki/Seventeenth_of_Tammuz" MSG %"Tzom Tammuz%" %b
+    REM [_PastSat(9,  "Av")] INFO "Url: https://en.wikipedia.org/wiki/Tisha_B%27Av" MSG %"Tish'a B'Av%" %b
+ENDIF
+
+IF IncludeOmer
+    SET ostart HEBDATE(16, "Nisan", TODAY()-50)
+    IF ostart <= TODAY() && (TODAY() - ostart < 49)
+        SET odays TODAY()-ostart+1
+        IF odays < 7
+            REM MSG %"%"Today is the [ORD(odays)] day of the Omer.
+        ELSE
+            IF !(odays % 7)
+                REM MSG %"%"Today is the [ORD(odays)] day of the Omer, being [odays / 7] [PLURAL(odays/7, "week")] of the Omer.
+            ELSE
+                REM MSG %"%"Today is the [ORD(odays)] day of the Omer, being [odays/7] [PLURAL(odays/7, "week")] and [odays%7] [PLURAL(odays%7, "day")] of the Omer.
+            ENDIF
+        ENDIF
+    ENDIF
+ENDIF
+
+IF IncludeOmerCal
+REM CAL [ORD(odays)] of Omer
 ENDIF

 # Tidy up
--- a/include/holidays/jm.rem
+++ b/include/holidays/jm.rem
@@ -6,19 +6,19 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-46] MSG Ash Wednesday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 23 May MSG National Labour Day
-REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 23)) == 0] MSG National Labour Day (observed)
-REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 23)) == 6] MSG National Labour Day (observed)
+REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Labour Day (observed)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG National Labour Day (observed)
 OMIT 1 August MSG Emancipation Day
-REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Emancipation Day (observed)
 OMIT 6 August MSG Independence Day
-REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Independence Day (observed)
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 REM Third Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/jp.rem
+++ b/include/holidays/jp.rem
@@ -3,25 +3,25 @@
 # Public Holidays in Japan, courtesy of Brandon Wilson.

 OMIT January 01 MSG 元日
-REM January 15 UNTIL December 31 1999 ADDOMIT MSG 成人の日
+REM January 15 UNTIL December 31 1999 SCANFROM -28 ADDOMIT MSG 成人の日
 REM Second Monday in January SCANFROM -7 ADDOMIT SATISFY [$Ty >= 2000] MSG 成人の日
-REM February 11 ADDOMIT SATISFY [$Ty >= 1967] MSG 建国記念の日
-REM February 23 ADDOMIT SATISFY [$Ty >= 2020] MSG 天皇誕生日
+REM February 11 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1967] MSG 建国記念の日
+REM February 23 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 2020] MSG 天皇誕生日
 REM [datepart(soleq(0))] SCANFROM -7 ADDOMIT MSG  春分の日
-REM April 29 UNTIL December 31 2006 ADDOMIT SATISFY [$Ty >= 1989] MSG みどりの日
-REM April 29 ADDOMIT SATISFY [$Ty >= 2007] MSG 昭和の日
+REM April 29 UNTIL December 31 2006 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1989] MSG みどりの日
+REM April 29 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 2007] MSG 昭和の日
 OMIT May 03 MSG 憲法記念日
-REM May 4 ADDOMIT SATISFY [$Ty >= 2007] MSG みどりの日
+REM May 4 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 2007] MSG みどりの日
 OMIT May 05 MSG こどもの日
-REM July 20 UNTIL December 31 2002 ADDOMIT SATISFY [$Ty >= 1996] MSG 海の日
+REM July 20 UNTIL December 31 2002 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1996] MSG 海の日
 REM Third Monday in July SCANFROM -7 ADDOMIT SATISFY [$Ty >= 2003] MSG 海の日
-REM August 11 ADDOMIT SATISFY [$Ty >= 2016] MSG 山の日
-REM September 15 UNTIL December 31 2002 ADDOMIT SATISFY [$Ty >= 1966] MSG 敬老の日
-REM Third Monday in September SCANFROM -7 ADDOMIT SATISFY [$Ty >= 2003] MSG 敬老の日
-REM [datepart(soleq(2))] SCANFROM -7 ADDOMIT MSG 秋分の日
-REM October 10 UNTIL December 31 1999 ADDOMIT SATISFY [$Ty >= 1966] MSG 体育の日
+REM August 11 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 2016] MSG 山の日
+REM September 15 UNTIL December 31 2002 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1966] MSG 敬老の日
+REM Third Monday in September SCANFROM -28 ADDOMIT SATISFY [$Ty >= 2003] MSG 敬老の日
+REM [datepart(soleq(2))] SCANFROM -28 ADDOMIT MSG 秋分の日
+REM October 10 UNTIL December 31 1999 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1966] MSG 体育の日
 REM Second Monday in October UNTIL December 31 2019 SCANFROM -7 ADDOMIT SATISFY [$Ty >= 2000] MSG 体育の日
 REM Second Monday in October SCANFROM -7 ADDOMIT SATISFY [$Ty >= 2020] MSG スポーツの日
 OMIT November 03 MSG 文化の日
 OMIT November 23 MSG 勤労感謝の日
-REM December 23 UNTIL December 31 2018 ADDOMIT SATISFY [$Ty >= 1989] MSG 天皇の誕生日
+REM December 23 UNTIL December 31 2018 SCANFROM -28 ADDOMIT SATISFY [$Ty >= 1989] MSG 天皇の誕生日
--- a/include/holidays/ke.rem
+++ b/include/holidays/ke.rem
@@ -6,20 +6,20 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT 1 June MSG Madaraka Day
-REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG Madaraka Day (observed)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Madaraka Day (observed)
 OMIT 10 October MSG Utamaduni Day
-REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Utamaduni Day (observed)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Utamaduni Day (observed)
 OMIT 20 October MSG Mashujaa Day
-REM 21 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 20)) == 0] MSG Mashujaa Day (observed)
+REM 21 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Mashujaa Day (observed)
 OMIT 12 December MSG Jamhuri Day
-REM 13 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 12)) == 0] MSG Jamhuri Day (observed)
+REM 13 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Jamhuri Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/kn.rem
+++ b/include/holidays/kn.rem
@@ -7,8 +7,8 @@

 OMIT 1 January MSG Carnival Day
 OMIT 2 January MSG Carnival Day - Last Lap
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Carnival Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Carnival Day - Last Lap (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Carnival Day - Last Lap (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Carnival Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
@@ -16,13 +16,13 @@ OMIT [easterdate($Uy)+50] MSG Whit Monday
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 REM Tuesday 2 August ADDOMIT SCANFROM -28 MSG Culturama Day - Last Lap
 OMIT 16 September MSG National Heroes Day
-REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG National Heroes Day (observed)
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Heroes Day (observed)
 OMIT 19 September MSG Independence Day
-REM 20 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 19)) == 0] MSG Independence Day (observed)
+REM 20 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)

 # Optional holidays
 REM 25 August MSG Kim Collins Day
--- a/include/holidays/lv.rem
+++ b/include/holidays/lv.rem
@@ -11,14 +11,14 @@ OMIT [easterdate($Uy)] MSG Lieldienas
 OMIT [easterdate($Uy)+1] MSG Otrās Lieldienas
 OMIT 1 May MSG Darba svētki
 OMIT 4 May MSG Latvijas Republikas Neatkarības atjaunošanas diena
-REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
-REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
 REM Second Sunday in May ADDOMIT SCANFROM -28 MSG Mātes diena
 OMIT 23 June MSG Līgo diena
 OMIT 24 June MSG Jāņu diena
 OMIT 18 November MSG Latvijas Republikas proklamēšanas diena
-REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 18)) == 0] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 18)) == 6] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
 OMIT 24 December MSG Ziemassvētku vakars
 OMIT 25 December MSG Ziemassvētki
 OMIT 26 December MSG Otrie Ziemassvētki
--- a/include/holidays/mc.rem
+++ b/include/holidays/mc.rem
@@ -6,21 +6,21 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Le jour de l'An
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Le jour de l'An (observé)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Le jour de l'An (observé)
 OMIT 27 January MSG La Sainte Dévote
 OMIT [easterdate($Uy)+1] MSG Le lundi de Pâques
 OMIT 1 May MSG Fête de la Travaille
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Fête de la Travaille (observé)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Fête de la Travaille (observé)
 OMIT [easterdate($Uy)+39] MSG L'Ascension
 OMIT [easterdate($Uy)+50] MSG Le lundi de Pentecôte
 OMIT [easterdate($Uy)+60] MSG La Fête Dieu
 OMIT 15 August MSG L'Assomption de Marie
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG L'Assomption de Marie (observé)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG L'Assomption de Marie (observé)
 OMIT 1 November MSG La Toussaint
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG La Toussaint (observé)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG La Toussaint (observé)
 OMIT 19 November MSG La Fête du Prince
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG La Fête du Prince (observé)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG La Fête du Prince (observé)
 REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG L'Immaculée Conception
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG L'Immaculée Conception
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG L'Immaculée Conception
 OMIT 25 December MSG Noël
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Noël (observé)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Noël (observé)
--- a/include/holidays/me.rem
+++ b/include/holidays/me.rem
@@ -7,8 +7,8 @@

 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG New Year's Day (observed)
 OMIT 6 January MSG Orthodox Christmas Eve
 OMIT 7 January MSG Orthodox Christmas
 OMIT [orthodoxeaster($Uy)-2] MSG Orthodox Good Friday
@@ -16,13 +16,13 @@ OMIT [orthodoxeaster($Uy)] MSG Orthodox Easter Sunday
 OMIT [orthodoxeaster($Uy)+1] MSG Orthodox Easter Monday
 OMIT 1 May MSG Labour Day
 OMIT 2 May MSG Labour Day
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Labour Day (observed)
 OMIT 21 May MSG Independence Day
 OMIT 22 May MSG Independence Day
-REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 21)) == 0] MSG Independence Day (observed)
-REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG Independence Day (observed)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Independence Day (observed)
 OMIT 13 July MSG Statehood Day
 OMIT 14 July MSG Statehood Day
-REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 13)) == 0] MSG Statehood Day (observed)
-REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 14)) == 0] MSG Statehood Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Statehood Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Statehood Day (observed)
--- a/include/holidays/mh.rem
+++ b/include/holidays/mh.rem
@@ -6,17 +6,17 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day Holiday
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day Holiday
 OMIT 1 March MSG Nuclear Victims Remembrance Day
-REM 2 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 1)) == 0] MSG Nuclear Victims Remembrance Day Holiday
+REM 2 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Nuclear Victims Remembrance Day Holiday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 1 May MSG Constitution Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Constitution Day Holiday
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day Holiday
 REM First Friday in July ADDOMIT SCANFROM -28 MSG Fisherman's Day
 REM First Friday in September ADDOMIT SCANFROM -28 MSG Dri-jerbal Day
 REM Last Friday in September ADDOMIT SCANFROM -28 MSG Manit Day
 OMIT 17 November MSG President's Day
-REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 17)) == 0] MSG President's Day Holiday
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG President's Day Holiday
 REM First Friday in December ADDOMIT SCANFROM -28 MSG Gospel Day
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day Holiday
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day Holiday
--- a/include/holidays/mp.rem
+++ b/include/holidays/mp.rem
@@ -6,37 +6,37 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
-REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Commonwealth Covenant Day (observed)
 OMIT 24 March MSG Commonwealth Covenant Day
-REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Commonwealth Covenant Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Commonwealth Cultural Day
 REM Tuesday 2 November ADDOMIT SCANFROM -28 MSG Election Day
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Citizenship Day (observed)
 OMIT 4 November MSG Citizenship Day
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Citizenship Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Constitution Day (observed)
 OMIT 8 December MSG Constitution Day
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 14 February MSG Valentine's Day
--- a/include/holidays/mw.rem
+++ b/include/holidays/mw.rem
@@ -6,31 +6,31 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
 OMIT 15 January MSG John Chilembwe Day
-REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG John Chilembwe Day (observed)
-REM 17 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 6] MSG John Chilembwe Day (observed)
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG John Chilembwe Day (observed)
+REM 17 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG John Chilembwe Day (observed)
 OMIT 3 March MSG Martyrs Day
-REM 4 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3)) == 0] MSG Martyrs Day (observed)
-REM 5 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3)) == 6] MSG Martyrs Day (observed)
+REM 4 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Martyrs Day (observed)
+REM 5 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Martyrs Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Labour Day (observed)
 OMIT 14 May MSG Kamuzu Day
-REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 14)) == 0] MSG Kamuzu Day (observed)
-REM 16 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 14)) == 6] MSG Kamuzu Day (observed)
+REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Kamuzu Day (observed)
+REM 16 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Kamuzu Day (observed)
 OMIT 6 July MSG Independence Day
-REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 6)) == 0] MSG Independence Day (observed)
-REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 6)) == 6] MSG Independence Day (observed)
+REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Independence Day (observed)
 OMIT 15 October MSG Mother's Day
-REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 15)) == 0] MSG Mother's Day (observed)
-REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 15)) == 6] MSG Mother's Day (observed)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Mother's Day (observed)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Mother's Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/mz.rem
+++ b/include/holidays/mz.rem
@@ -6,20 +6,20 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG Dia da Fraternidade universal
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Dia da Fraternidade universal (ponte)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Fraternidade universal (ponte)
 OMIT 3 February MSG Dia dos Heróis Moçambicanos
-REM 4 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 3)) == 0] MSG Dia dos Heróis Moçambicanos (ponte)
+REM 4 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia dos Heróis Moçambicanos (ponte)
 OMIT 7 April MSG Dia da Mulher Moçambicana
-REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 7)) == 0] MSG Dia da Mulher Moçambicana (ponte)
+REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Mulher Moçambicana (ponte)
 OMIT 1 May MSG Dia Internacional dos Trabalhadores
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Dia Internacional dos Trabalhadores (ponte)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia Internacional dos Trabalhadores (ponte)
 OMIT 25 June MSG Dia da Independência Nacional
-REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 25)) == 0] MSG Dia da Independência Nacional (ponte)
+REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Independência Nacional (ponte)
 OMIT 7 September MSG Dia da Vitória
-REM 8 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 7)) == 0] MSG Dia da Vitória (ponte)
+REM 8 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Vitória (ponte)
 OMIT 25 September MSG Dia das Forças Armadas de Libertação Nacional
-REM 26 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 25)) == 0] MSG Dia das Forças Armadas de Libertação Nacional (ponte)
+REM 26 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia das Forças Armadas de Libertação Nacional (ponte)
 OMIT 4 October MSG Dia da Paz e Reconciliação
-REM 5 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 4)) == 0] MSG Dia da Paz e Reconciliação (ponte)
+REM 5 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Paz e Reconciliação (ponte)
 OMIT 25 December MSG Dia da Família
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Dia da Família (ponte)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Dia da Família (ponte)
--- a/include/holidays/na.rem
+++ b/include/holidays/na.rem
@@ -6,22 +6,22 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 21 March MSG Independence Day
-REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 21)) == 0] MSG Independence Day (observed)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Workers' Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Workers' Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Workers' Day (observed)
 OMIT 4 May MSG Cassinga Day
-REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Cassinga Day (observed)
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Cassinga Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 25 May MSG Africa Day
-REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 25)) == 0] MSG Africa Day (observed)
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Africa Day (observed)
 OMIT 26 August MSG Heroes' Day
-REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG Heroes' Day (observed)
+REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Heroes' Day (observed)
 OMIT 10 September MSG Day of the Namibian Women and International Human Rights Day
-REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Day of the Namibian Women and International Human Rights Day (observed)
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Day of the Namibian Women and International Human Rights Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Family Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Family Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Family Day (observed)
--- a/include/holidays/nl.rem
+++ b/include/holidays/nl.rem
@@ -23,4 +23,4 @@ REM [easterdate($Uy)-2] MSG Goede Vrijdag
 # Bevrijdingsdag is a holiday every 5th year.
 # Hence the two reminders below
 REM 5 May SATISFY [$Ty % 5 != 0] MSG Bevrijdingsdag
-REM 5 May ADDOMIT SATISFY [$Ty % 5 == 0] MSG Bevrijdingsdag
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [$Ty % 5 == 0] MSG Bevrijdingsdag
--- a/include/holidays/nz.rem
+++ b/include/holidays/nz.rem
@@ -14,23 +14,23 @@

 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG Day after New Year's Day
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Day after New Year's Day (observed)
-REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG Day after New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG New Year's Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Day after New Year's Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Day after New Year's Day (observed)
 OMIT 6 February MSG Waitangi Day
-REM 7 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 6)) == 0] MSG Waitangi Day (observed)
-REM 8 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 6)) == 6] MSG Waitangi Day (observed)
+REM 7 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Waitangi Day (observed)
+REM 8 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Waitangi Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 25 April MSG Anzac Day
-REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG Anzac Day (observed)
-REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG Anzac Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Anzac Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Anzac Day (observed)
 REM First Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM Fourth Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Boxing Day (observed)
--- a/include/holidays/pa.rem
+++ b/include/holidays/pa.rem
@@ -6,22 +6,22 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 9 January MSG Martyrs' Day
-REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 9)) == 0] MSG Martyrs' Day (observed)
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Martyrs' Day (observed)
 OMIT [easterdate($Uy)-47] MSG Carnival
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT 3 November MSG Separation Day
 OMIT 4 November MSG National Symbols Day
 OMIT 5 November MSG Colon Day
 OMIT 10 November MSG Los Santos Uprising Day
 OMIT 28 November MSG Independence Day
-REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Independence Day (observed)
+REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 8 December MSG Mother's Day
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Mother's Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Mother's Day (observed)
 OMIT 20 December MSG National Mourning Day
-REM 21 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 20)) == 0] MSG National Mourning Day (observed)
+REM 21 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Mourning Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
--- a/include/holidays/pg.rem
+++ b/include/holidays/pg.rem
@@ -6,19 +6,19 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 26 February MSG Grand Chief Sir Michael Somare Remembrance Day
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 17 June MSG King's Birthday
 OMIT 23 July MSG Papua New Guinea Remembrance Day
-REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 23)) == 0] MSG Papua New Guinea Remembrance Day (observed)
+REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Papua New Guinea Remembrance Day (observed)
 OMIT 26 August MSG National Repentance Day
-REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG National Repentance Day (observed)
+REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Repentance Day (observed)
 OMIT 16 September MSG Independence Day
-REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG Independence Day (observed)
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/pr.rem
+++ b/include/holidays/pr.rem
@@ -6,33 +6,33 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 6 January MSG Epiphany
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Presidents' Day
 OMIT 22 March MSG Emancipation Day
-REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22)) == 0] MSG Emancipation Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Emancipation Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 25 July MSG Constitution Day
-REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Constitution Day (observed)
+REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 OMIT 19 November MSG Discovery Day
-REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Discovery Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Discovery Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 14 February MSG Valentine's Day
--- a/include/holidays/pw.rem
+++ b/include/holidays/pw.rem
@@ -6,29 +6,29 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 14 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 15)) == 6] MSG Youth Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
+REM 14 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Youth Day (observed)
 OMIT 15 March MSG Youth Day
-REM 16 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 15)) == 0] MSG Youth Day (observed)
-REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5)) == 6] MSG Senior Citizens Day (observed)
+REM 16 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Youth Day (observed)
+REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Senior Citizens Day (observed)
 OMIT 5 May MSG Senior Citizens Day
-REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5)) == 0] MSG Senior Citizens Day (observed)
-REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 6] MSG President's Day (observed)
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Senior Citizens Day (observed)
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG President's Day (observed)
 OMIT 1 June MSG President's Day
-REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG President's Day (observed)
-REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 9)) == 6] MSG Constitution Day (observed)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG President's Day (observed)
+REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Constitution Day (observed)
 OMIT 9 July MSG Constitution Day
-REM 10 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 9)) == 0] MSG Constitution Day (observed)
+REM 10 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
-REM 30 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 6] MSG Independence Day (observed)
+REM 30 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 1 October MSG Independence Day
-REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Independence Day (observed)
-REM 23 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 24)) == 6] MSG United Nations Day (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
+REM 23 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG United Nations Day (observed)
 OMIT 24 October MSG United Nations Day
-REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 24)) == 0] MSG United Nations Day (observed)
+REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG United Nations Day (observed)
 REM Fourth Friday in November ADDOMIT SCANFROM -28 MSG Family Day
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving Day
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)
--- a/include/holidays/rs.rem
+++ b/include/holidays/rs.rem
@@ -7,20 +7,20 @@

 OMIT 1 January MSG Нова година
 OMIT 2 January MSG Нова година
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Нова година (слободан дан)
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Нова година (слободан дан)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Нова година (слободан дан)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Нова година (слободан дан)
 OMIT 7 January MSG Божић
 OMIT 15 February MSG Дан државности Србије
 OMIT 16 February MSG Дан државности Србије
-REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 15)) == 0] MSG Дан државности Србије (слободан дан)
-REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 16)) == 0] MSG Дан државности Србије (слободан дан)
+REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Дан државности Србије (слободан дан)
+REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Дан државности Србије (слободан дан)
 OMIT [orthodoxeaster($Uy)-2] MSG Велики петак
 OMIT [orthodoxeaster($Uy)-1] MSG Велика субота
 OMIT [orthodoxeaster($Uy)] MSG Васкрс
 OMIT [orthodoxeaster($Uy)+1] MSG Други дан Васкрса
 OMIT 1 May MSG Празник рада
 OMIT 2 May MSG Празник рада
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Празник рада (слободан дан)
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Празник рада (слободан дан)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Празник рада (слободан дан)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Празник рада (слободан дан)
 OMIT 11 November MSG Дан примирја у Првом светском рату
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Дан примирја у Првом светском рату (слободан дан)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Дан примирја у Првом светском рату (слободан дан)
--- a/include/holidays/sa.rem
+++ b/include/holidays/sa.rem
@@ -5,9 +5,9 @@
 #
 # See important caveats in the README file in this directory.

-REM 21 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 22)) == 5] MSG (ملاحظة) يوم التأسيسي
+REM 21 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG (ملاحظة) يوم التأسيسي
 OMIT 22 February MSG يوم التأسيسي
-REM 23 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 22)) == 6] MSG (ملاحظة) يوم التأسيسي
-REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 23)) == 5] MSG (ملاحظة) اليوم الوطني
+REM 23 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 6] MSG (ملاحظة) يوم التأسيسي
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG (ملاحظة) اليوم الوطني
 OMIT 23 September MSG اليوم الوطني
-REM 24 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 23)) == 6] MSG (ملاحظة) اليوم الوطني
+REM 24 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 6] MSG (ملاحظة) اليوم الوطني
--- a/include/holidays/sc.rem
+++ b/include/holidays/sc.rem
@@ -7,22 +7,22 @@

 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year Holiday
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year Holiday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+60] MSG The Fete Dieu
 OMIT 18 June MSG Constitution Day
-REM 19 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 18)) == 0] MSG Constitution Day (observed)
+REM 19 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
 OMIT 29 June MSG Independence (National) Day
-REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG Independence (National) Day (observed)
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence (National) Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Assumption Day (observed)
 OMIT 1 November MSG All Saints Day
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG All Saints Day (observed)
 OMIT 8 December MSG The Feast of the Immaculate Conception
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG The Feast of the Immaculate Conception (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG The Feast of the Immaculate Conception (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
--- a/include/holidays/sz.rem
+++ b/include/holidays/sz.rem
@@ -6,21 +6,21 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 19 April MSG King's Birthday
-REM 20 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 0] MSG King's Birthday (observed)
+REM 20 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG King's Birthday (observed)
 OMIT 25 April MSG National Flag Day
-REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG National Flag Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG National Flag Day (observed)
 OMIT 1 May MSG Worker's Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Worker's Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Worker's Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 22 July MSG Birthday of Late King Sobhuza
-REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 22)) == 0] MSG Birthday of Late King Sobhuza (observed)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Birthday of Late King Sobhuza (observed)
 OMIT 6 September MSG Independence Day
-REM 7 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 6)) == 0] MSG Independence Day (observed)
+REM 7 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG Christmas Day (observed)
--- a/include/holidays/td.rem
+++ b/include/holidays/td.rem
@@ -6,17 +6,17 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Labour Day (observed)
 OMIT 11 August MSG Independence Day
-REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 11)) == 0] MSG Independence Day (observed)
+REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 OMIT 1 November MSG All Saints' Day
 OMIT 28 November MSG Republic Day
-REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Republic Day (observed)
+REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Republic Day (observed)
 OMIT 1 December MSG Freedom and Democracy Day
-REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 1)) == 0] MSG Freedom and Democracy Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Freedom and Democracy Day (observed)
 OMIT 25 December MSG Christmas Day
--- a/include/holidays/th.rem
+++ b/include/holidays/th.rem
@@ -6,57 +6,57 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG วันขึ้นปีใหม่
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG ชดเชยวันขึ้นปีใหม่
-REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG ชดเชยวันขึ้นปีใหม่
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันขึ้นปีใหม่
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันขึ้นปีใหม่
 REM Second Saturday in January ADDOMIT SCANFROM -28 MSG วันเด็กแห่งชาติ
-REM 25 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 24)) == 0] MSG ชดเชยวันมาฆบูชา
-REM 26 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 24)) == 6] MSG ชดเชยวันมาฆบูชา
+REM 25 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันมาฆบูชา
+REM 26 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันมาฆบูชา
 OMIT 6 April MSG วันจักรี
-REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG ชดเชยวันจักรี
-REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 6] MSG ชดเชยวันจักรี
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันจักรี
+REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันจักรี
 OMIT 13 April MSG วันสงกรานต์
 REM 13 April OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 4, 13)), 0, 6)] MSG ชดเชยวันสงกรานต์
 OMIT 14 April MSG วันสงกรานต์
 OMIT 15 April MSG วันสงกรานต์
 OMIT 1 May MSG วันแรงงานแห่งชาติ
-REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG ชดเชยวันแรงงานแห่งชาติ
-REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG ชดเชยวันแรงงานแห่งชาติ
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันแรงงานแห่งชาติ
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันแรงงานแห่งชาติ
 OMIT 4 May MSG วันฉัตรมงคล
-REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG ชดเชยวันฉัตรมงคล
-REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG ชดเชยวันฉัตรมงคล
-REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 10)) == 0] MSG ชดเชยวันพืชมงคล
-REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 10)) == 6] MSG ชดเชยวันพืชมงคล
-REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG ชดเชยวันวิสาขบูชา
-REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 6] MSG ชดเชยวันวิสาขบูชา
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันฉัตรมงคล
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันฉัตรมงคล
+REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันพืชมงคล
+REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันพืชมงคล
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันวิสาขบูชา
+REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันวิสาขบูชา
 OMIT 3 June MSG วันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 3)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 3)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 20)) == 0] MSG ชดเชยวันอาสาฬหบูชา
-REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 20)) == 6] MSG ชดเชยวันอาสาฬหบูชา
-REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 21)) == 6] MSG ชดเชยวันเข้าพรรษา
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
+REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 0] MSG ชดเชยวันอาสาฬหบูชา
+REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันอาสาฬหบูชา
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันเข้าพรรษา
 OMIT 28 July MSG วันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
-REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 28)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
-REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 28)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
 OMIT 12 August MSG วันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
 OMIT 12 August MSG วันแม่แห่งชาติ
-REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 12)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
-REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 12)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
+REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
+REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
 OMIT 13 October MSG วันนวมินทรมหาราช
-REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG ชดเชยวันนวมินทรมหาราช
-REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 6] MSG ชดเชยวันนวมินทรมหาราช
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันนวมินทรมหาราช
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันนวมินทรมหาราช
 OMIT 23 October MSG วันปิยมหาราช
-REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 23)) == 0] MSG ชดเชยวันปิยมหาราช
-REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 23)) == 6] MSG ชดเชยวันปิยมหาราช
+REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันปิยมหาราช
+REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันปิยมหาราช
 OMIT 5 December MSG วันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
 OMIT 5 December MSG วันชาติ
 OMIT 5 December MSG วันพ่อแห่งชาติ
-REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
-REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันชาติ
-REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
-REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันชาติ
+REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
+REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันชาติ
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันชาติ
 OMIT 10 December MSG วันรัฐธรรมนูญ
-REM 11 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 10)) == 0] MSG ชดเชยวันรัฐธรรมนูญ
-REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 10)) == 6] MSG ชดเชยวันรัฐธรรมนูญ
+REM 11 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG ชดเชยวันรัฐธรรมนูญ
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG ชดเชยวันรัฐธรรมนูญ
 OMIT 31 December MSG วันสิ้นปี

 # Optional holidays
--- a/include/holidays/to.rem
+++ b/include/holidays/to.rem
@@ -9,30 +9,30 @@ OMIT 1 January MSG 'Uluaki 'Aho 'o e Ta'u Fo'ou
 OMIT [easterdate($Uy)-2] MSG Falaite Lelei
 OMIT [easterdate($Uy)+1] MSG Monite 'o e Toetu'u
 OMIT 25 April MSG 'Aho Anzac
-REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 3] MSG 'Aho Tau'ataina (fakatokanga'i)
-REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 2] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG 'Aho Tau'ataina (fakatokanga'i)
 REM 4 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Tau'ataina (fakatokanga'i)
-REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 0] MSG 'Aho Tau'ataina (fakatokanga'i)
-REM 6 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 6] MSG 'Aho Tau'ataina (fakatokanga'i)
-REM 7 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 5] MSG 'Aho Tau'ataina (fakatokanga'i)
-REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 4] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 6 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 7 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG 'Aho Tau'ataina (fakatokanga'i)
 OMIT 4 July MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule (fakatokanga'i)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule (fakatokanga'i)
 OMIT 17 September MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga
-REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 0] MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga (fakatokanga'i)
-REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 3] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 2] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga (fakatokanga'i)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 4 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 5] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 8 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 4] MSG 'Aho Konisitutone (fakatokanga'i)
-REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 3] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-REM 3 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 2] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 8 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 3] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 3 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 REM 4 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-REM 5 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 6] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 5] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-REM 8 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 4] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 5 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-3) == 5] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-4) == 4] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 OMIT 25 December MSG 'Aho Kilisimasi
 OMIT 26 December MSG 'Aho 2 'o e Kilisimasi
--- a/include/holidays/tw.rem
+++ b/include/holidays/tw.rem
@@ -11,16 +11,16 @@ REM 1 January OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(d
 OMIT 28 February MSG 和平紀念日
 REM 28 February OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 2, 28)), 0, 6)] MSG 和平紀念日（慶祝）
 REM 28 February OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 2, 28)), 0, 6)] MSG 和平紀念日（慶祝）
-REM 2 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 0] MSG 兒童節（慶祝）
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG 兒童節（慶祝）
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 3] MSG 兒童節（慶祝）
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 5] MSG 兒童節（慶祝）
-REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 6] MSG 兒童節（慶祝）
+REM 2 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 0] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 2] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 3] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG 兒童節（慶祝）
 OMIT 4 April MSG 兒童節
 REM 4 April OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 4, 4)), 0, 6)] MSG 清明節（慶祝）
 REM 4 April OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 4, 4)), 0, 6)] MSG 清明節（慶祝）
-REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 1] MSG 兒童節（慶祝）
-REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG 兒童節（慶祝）
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG 兒童節（慶祝）
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 4] MSG 兒童節（慶祝）
 OMIT 10 October MSG 中華民國國慶日
 REM 10 October OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 10, 10)), 0, 6)] MSG 中華民國國慶日（慶祝）
 REM 10 October OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 10, 10)), 0, 6)] MSG 中華民國國慶日（慶祝）
--- a/include/holidays/um.rem
+++ b/include/holidays/um.rem
@@ -6,25 +6,25 @@
 # See important caveats in the README file in this directory.

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 14 February MSG Valentine's Day
--- a/include/holidays/us.rem
+++ b/include/holidays/us.rem
@@ -13,25 +13,25 @@
 # [$SysInclude]/holidays/us/

 OMIT 1 January MSG New Year's Day
-REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Day (observed)
 REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
 REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
-REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Independence Day (observed)
 REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
-REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Veterans Day (observed)
 REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
-REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Day (observed)

 # Optional holidays
 REM 2 February MSG Groundhog Day
--- a/include/holidays/us/ak.rem
+++ b/include/holidays/us/ak.rem
@@ -12,6 +12,6 @@

 REM Last Monday in March ADDOMIT SCANFROM -28 MSG Seward's Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
-REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 18)) == 6] MSG Alaska Day (observed)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Alaska Day (observed)
 OMIT 18 October MSG Alaska Day
-REM 19 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 18)) == 0] MSG Alaska Day (observed)
+REM 19 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Alaska Day (observed)
--- a/include/holidays/us/as.rem
+++ b/include/holidays/us/as.rem
@@ -10,11 +10,11 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG American Samoa Flag Day (observed)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG American Samoa Flag Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Manu'a Islands Cession Day (observed)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Manu'a Islands Cession Day (observed)
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
 REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
--- a/include/holidays/us/ca.rem
+++ b/include/holidays/us/ca.rem
@@ -12,5 +12,5 @@

 OMIT 15 February MSG Susan B. Anthony Day
 OMIT 31 March MSG Cesar Chavez Day
-REM 1 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 31)) == 0] MSG Cesar Chavez Day (observed)
+REM 1 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Cesar Chavez Day (observed)
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
--- a/include/holidays/us/ct.rem
+++ b/include/holidays/us/ct.rem
@@ -10,8 +10,8 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lincoln's Birthday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/include/holidays/us/dc.rem
+++ b/include/holidays/us/dc.rem
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 16)) == 6] MSG Emancipation Day (observed)
+REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Emancipation Day (observed)
 OMIT 16 April MSG Emancipation Day
-REM 17 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 16)) == 0] MSG Emancipation Day (observed)
+REM 17 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Emancipation Day (observed)
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
--- a/include/holidays/us/hi.rem
+++ b/include/holidays/us/hi.rem
@@ -10,10 +10,10 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 26)) == 6] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
 OMIT 26 March MSG Prince Jonah Kuhio Kalanianaole Day
-REM 27 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 26)) == 0] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
-REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 11)) == 6] MSG Kamehameha Day (observed)
+REM 27 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Kamehameha Day (observed)
 OMIT 11 June MSG Kamehameha Day
-REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 11)) == 0] MSG Kamehameha Day (observed)
+REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Kamehameha Day (observed)
 REM Third Friday in August ADDOMIT SCANFROM -28 MSG Statehood Day
--- a/include/holidays/us/ia.rem
+++ b/include/holidays/us/ia.rem
@@ -10,6 +10,6 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lincoln's Birthday (observed)
--- a/include/holidays/us/il.rem
+++ b/include/holidays/us/il.rem
@@ -10,8 +10,8 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lincoln's Birthday (observed)
 REM First Monday in March ADDOMIT SCANFROM -28 MSG Casimir Pulaski Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/include/holidays/us/ks.rem
+++ b/include/holidays/us/ks.rem
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
--- a/include/holidays/us/ky.rem
+++ b/include/holidays/us/ky.rem
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Eve (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
+REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Eve (observed)
 OMIT 31 December MSG New Year's Eve
--- a/include/holidays/us/ma.rem
+++ b/include/holidays/us/ma.rem
@@ -11,7 +11,7 @@
 # also SYSINCLUDE holidays/us.rem

 OMIT 17 March MSG Evacuation Day
-REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Evacuation Day (observed)
-REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Evacuation Day (observed)
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Evacuation Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Evacuation Day (observed)
 REM Third Monday in April ADDOMIT SCANFROM -28 MSG Patriots' Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/include/holidays/us/mi.rem
+++ b/include/holidays/us/mi.rem
@@ -10,10 +10,10 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
-REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG New Year's Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
-REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
+REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG New Year's Eve (observed)
 OMIT 31 December MSG New Year's Eve
--- a/include/holidays/us/mo.rem
+++ b/include/holidays/us/mo.rem
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 7 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 8)) == 6] MSG Truman Day (observed)
+REM 7 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Truman Day (observed)
 OMIT 8 May MSG Truman Day
-REM 9 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 8)) == 0] MSG Truman Day (observed)
+REM 9 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Truman Day (observed)
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/include/holidays/us/mp.rem
+++ b/include/holidays/us/mp.rem
@@ -10,14 +10,14 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Commonwealth Covenant Day (observed)
 OMIT 24 March MSG Commonwealth Covenant Day
-REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Commonwealth Covenant Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Commonwealth Cultural Day
-REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Citizenship Day (observed)
 OMIT 4 November MSG Citizenship Day
-REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
-REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Citizenship Day (observed)
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Constitution Day (observed)
 OMIT 8 December MSG Constitution Day
-REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Constitution Day (observed)
--- a/include/holidays/us/nc.rem
+++ b/include/holidays/us/nc.rem
@@ -12,11 +12,11 @@

 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
-REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+2) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
 OMIT 26 December MSG Day After Christmas
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Day After Christmas (observed)
-REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Day After Christmas (observed)
-REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Day After Christmas (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Day After Christmas (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 1] MSG Day After Christmas (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-2) == 6] MSG Day After Christmas (observed)
--- a/include/holidays/us/nj.rem
+++ b/include/holidays/us/nj.rem
@@ -10,8 +10,8 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lincoln's Birthday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/include/holidays/us/nv.rem
+++ b/include/holidays/us/nv.rem
@@ -10,7 +10,7 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 25)) == 6] MSG Nevada Day (observed)
-REM 26 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 25)) == 0] MSG Nevada Day (observed)
+REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Nevada Day (observed)
+REM 26 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Nevada Day (observed)
 REM Last Friday in October ADDOMIT SCANFROM -28 MSG Nevada Day
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Family Day
--- a/include/holidays/us/ny.rem
+++ b/include/holidays/us/ny.rem
@@ -10,8 +10,8 @@
 # If you want the national holidays as well, you must
 # also SYSINCLUDE holidays/us.rem

-REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T+1) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum($T-1) == 0] MSG Lincoln's Birthday (observed)
 OMIT 15 February MSG Susan B. Anthony Day
 REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dianne Skoll	26de9d84f5	Update WHATSNEW in preparation for release.	2025-09-30 14:36:07 -04:00
Dianne Skoll	ba092fb781	Avoid warning in "make test"	2025-09-30 14:27:48 -04:00
Dianne Skoll	5fe1536b3b	Add updated "holidays/jewish.rem" courtesy of Nimrod Levy.	2025-09-30 13:24:51 -04:00
Dianne Skoll	9e3797d5ed	Simplify all calculations of dates relative to trigger date. Also fixes off-by-one errors for New Year's Day in many files.	2025-09-29 19:41:40 -04:00
Dianne Skoll	26ec92675c	Give more specific ADDOMIT advice.	2025-09-29 14:22:10 -04:00
Dianne Skoll	01461929d7	Fix line-counting logic that made entirely-empty weeks one row too short.	2025-09-29 09:48:15 -04:00
Dianne Skoll	b3a2c0e7c7	Don't add a spurious blank line if there are no entries at all for a given calendar row.	2025-09-28 22:52:44 -04:00
Dianne Skoll	a614383521	Fix off-by-one error pointed out by Nimrod Levy.	2025-09-27 19:40:30 -04:00
Dianne Skoll	9f139b0d02	More readable code.	2025-09-27 10:03:59 -04:00
Dianne Skoll	7decbed3ff	In the tests/ directory, make "make test" the default make target.	2025-09-27 09:39:20 -04:00
Dianne Skoll	5610590fa8	Be pickier about $WarningLevel. Make sure it matches the Perl regex: ^\d\d\.\d\d\.\d\d$	2025-09-27 09:38:00 -04:00
Dianne Skoll	be04097fbc	Document $WarningLevel	2025-09-25 18:14:56 -04:00
Dianne Skoll	5092d5bc16	More warning_level annotations.	2025-09-25 18:08:29 -04:00
Dianne Skoll	2f86920842	Add $WarningLevel special variable.	2025-09-25 17:55:16 -04:00
Dianne Skoll	604e1b049c	Add a warning to use SCANFROM with a moveable ADDOMIT.	2025-09-24 13:02:12 -04:00
Dianne Skoll	23081b556f	Update WHATSNEW	2025-09-19 13:42:50 -04:00
Dianne Skoll	e2cfa46289	Update version to 06.01.02	2025-09-19 13:41:03 -04:00
Dianne Skoll	71384da875	Document default --max-expr-limit.	2025-09-19 13:39:55 -04:00
Dianne Skoll	af69f8779d	Don't loop forever if a reminder moves backwards because of a time zone difference. If we are not making progress, it's because the reminder has expired.	2025-09-19 13:33:23 -04:00
Dianne Skoll	131e77fa18	Use "unsigned long" to track expresison node evaluations.	2025-09-13 11:38:55 -04:00
Dianne Skoll	f153acf7ce	Default max-expr-complexity to 10,000,000	2025-09-12 12:56:14 -04:00
Dianne Skoll	d75587fa7b	Update change log.	2025-09-12 11:43:15 -04:00
Dianne Skoll	d9a2b15814	Bump version number to 06.01.01.	2025-09-12 11:33:15 -04:00
Dianne Skoll	aa090bf319	Add tests for PrintValue string truncation.	2025-09-12 11:22:51 -04:00
Dianne Skoll	dc6a229f5f	Add some const qualifiers, as recommended by cppcheck.	2025-09-12 11:15:10 -04:00
Dianne Skoll	5a3840759a	Make PrintValue truncate long strings on a multibyte-character boundary instead of potentially splitting a UTF-8 sequence.	2025-09-12 11:12:19 -04:00
Dianne Skoll	779174ae32	Proper font formatting.	2025-09-11 17:26:43 -04:00
Dianne Skoll	2f70b37d4c	Be stricter about parsing hex constants.	2025-09-11 17:22:24 -04:00
Dianne Skoll	d15c8f106b	Support hexadecimal integer constants in expressions; add hex() function.	2025-09-11 17:02:22 -04:00
Dianne Skoll	9d999a0074	Support hexacdecimal integer constants in expressions.	2025-09-11 16:50:13 -04:00
Dianne Skoll	097dda1750	Make asc() always return a number between 0 and 255.	2025-09-11 16:42:32 -04:00
Dianne Skoll	565bca4380	Add statistic for max expr node evaluations per line.	2025-09-11 12:04:32 -04:00
Dianne Skoll	adb38fe82e	Fix off-by-one error.	2025-09-11 11:25:20 -04:00
Dianne Skoll	57545ddc3f	Add test for --max-expr-complexity	2025-09-11 11:20:29 -04:00
Dianne Skoll	804cf14a78	Implement --max-expr-complexity	2025-09-11 11:11:11 -04:00
Dianne Skoll	641b5cec57	Mode docs on columns() vs mbstrlen()	2025-09-10 23:07:23 -04:00
Dianne Skoll	df53db19c4	Fix typo	2025-09-10 23:02:15 -04:00
Dianne Skoll	d9bf902153	Put #ifdef guards around wide char code.	2025-09-10 17:56:32 -04:00
Dianne Skoll	53a12de2f9	Fix typo	2025-09-10 17:54:26 -04:00
Dianne Skoll	fe2b34da68	Avoid memory leak.	2025-09-10 17:54:06 -04:00
Dianne Skoll	7e70ffe7f5	Fix typo	2025-09-10 17:43:59 -04:00
Dianne Skoll	55975154b1	Add codepoint() and mbchar() functions.	2025-09-10 17:33:57 -04:00
Dianne Skoll	3c6191ba61	Add tests where index() does not find the needle.	2025-09-10 13:48:28 -04:00
Dianne Skoll	b00cf9c5b7	Remove some unnecessary assignments.	2025-09-10 13:48:18 -04:00
Dianne Skoll	a6838802ad	Use mbsubstr and mbstrlen.	2025-09-10 13:27:57 -04:00
Dianne Skoll	375576fcc5	Add better support for multi-byte character set. The functions mbindex, mbstrlen and mbsubstr are just like index, strlen and substr, but they use and return 1-based character indexes rather than 1-based byte indexes.	2025-09-10 13:25:27 -04:00