Make it clearer what went wrong if we use "remind" rather than "../src/remind"

Trick suggested by Jochen Sprickerhof.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for remind 05.00.08.
+# Generated by GNU Autoconf 2.71 for remind 05.01.01.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='05.00.08'
-PACKAGE_STRING='remind 05.00.08'
+PACKAGE_VERSION='05.01.01'
+PACKAGE_STRING='remind 05.01.01'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
 
@@ -1265,7 +1265,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 05.00.08 to adapt to many kinds of systems.
+\`configure' configures remind 05.01.01 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1327,7 +1327,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 05.00.08:";;
+     short | recursive ) echo "Configuration of remind 05.01.01:";;
    esac
   cat <<\_ACEOF
 
@@ -1415,7 +1415,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-remind configure 05.00.08
+remind configure 05.01.01
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1865,7 +1865,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 05.00.08, which was
+It was created by remind $as_me 05.01.01, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4710,7 +4710,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 05.00.08, which was
+This file was extended by remind $as_me 05.01.01, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4775,7 +4775,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 05.00.08
+remind config.status 05.01.01
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(remind, 05.00.08, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 05.01.01, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])
 
 cat <<'EOF'

contrib/remind-conf-mode/remind-conf-mode.el

@@ -111,7 +111,7 @@
   (sort
    (list "ADDOMIT" "AFTER" "AT" "BAN" "BANNER" "BEFORE" "CAL" "CLEAR"
          "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMP" "DUMPVARS" "DURATION" "ELSE"
-         "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST" "FLUSH" "FOURTH" "FROM" "FSET"
+         "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST" "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET"
          "FUNSET" "IF" "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "LAST"
          "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF" "MSG"
          "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP" "POP-OMIT-CONTEXT" "PRESERVE"
@@ -128,9 +128,10 @@
 
 (defconst remind-builtin-variables
   (sort
-   (list "$AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
+   (list " $AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
          "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DateTimeSep" "$December"
-         "$DefaultColor" "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
+         "$DedupeReminders" "$DefaultColor" "$DefaultDelta"
+         "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
          "$DontFork" "$DontQueue" "$DontTrigAts" "$EndSent" "$EndSentIg"
          "$ExpressionTimeLimit" "$February" "$FirstIndent" "$FoldYear"
          "$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode"

docs/WHATSNEW

@@ -1,5 +1,37 @@
 CHANGES TO REMIND
 
+* VERSION 5.1 Patch 1 - 2024-11-18
+
+- BUG FIX: Fix a bug in test-rem that could have caused test failures.
+  Fix courtesy of Jochen Sprickerhof.
+
+* VERSION 5.1 Patch 0 - 2024-11-18
+
+- MAJOR IMPROVEMENT: Include holiday files for many countries and
+  regions, courtesy of the Python "holidays" project:
+  https://pypi.org/project/holidays/  See include/holidays/README
+  for usage instructions and important caveats
+
+- NEW FEATURE: remind: Added the $DedupeReminders system variable; see
+  its documentation in the remind man page for details.
+
+- NEW FEATURE: remind: Added the FRENAME command to rename a user-defined
+  function.  See its documentation in the remind man page for use-cases.
+
+- NEW FEATURE: remind: Added the $DefaultDelta system variable that
+  specifies a default (date) delta for reminders that lack one.  It is
+  analogous to the default time delta system variable $DefaultTDelta.
+
+- IMPROVEMENT: remind: Added a way for the output of msgsuffix() to appear
+  on the same line as a reminder rather than on the next line.  See the
+  remind man page for details.
+
+- UPDATE: contrib/ical2rem: Update to upstream version 0.8
+
+- DOCUMENTATION FIXES: Many updates and clarifications to the man pages.
+
+- BUG FIX: Fixed configure.ac so that autoreconf works.
+
 * VERSION 5.0 Patch 7 - 2024-10-16
 
 - NEW FEATURE: tkremind: Add option to create a desktop notification when

include/holidays/README

@@ -0,0 +1,62 @@
+This directory contains holiday files.  The two-character files contain
+holidays for various countries.  Some countries (such as US and CA) have
+regions with their own different holidays; the regional holidays are
+stored in *.rem files underneath the country-code directory (eg, us and ca,
+respectively.)
+
+Many of these files were generated from the excellent "holidays" Python
+library at https://pypi.org/project/holidays/
+
+I did great damage to the library and host a terrible, awful hacked version
+at https://github.com/dfskoll/holidays; it is this repo (in the remind-output
+branch) that I used to generate the Remind files.
+
+********************** IMPORTANT CAVEATS **********************
+
+Any holidays that depend on a non-Gregorian calendar such as Jewish,
+Islamic, Chinese and other East Asian calendars will NOT appear in the
+country files!  The only exceptions are holidays depending on the
+Orthodox Easter date, for which Remind has support.
+
+Also, I have made no effort to track changes to holiday legislation
+over time.  Therefore, the holiday files may be inaccurate for years
+prior to 2024.  I also did not include any one-off holidays such as
+the funeral of Queen Elizabeth on 19 September 2022.
+
+Non-country holiday files are:
+
+chinese-new-year.rem - Chinese New Year from 2022 through 2050
+discordian.rem       - Discordian holidays
+jewish.rem           - Jewish holidays
+pagan.rem            - Pagan holidays
+
+ADVANCE WARNING:
+================
+
+None of the included holiday files have deltas or substitution sequences.
+You can use the following trick if you would like (for example) 7 days'
+advance warning of holidays:
+
+    # Save old definition (if any) of msgsuffix
+    FRENAME msgsuffix saved_msgsuffix
+
+    # Save old value of $DefaultDelta
+    SET old_delta $DefaultDelta
+
+    # We want 7 days' advance warning
+    SET $DefaultDelta 7
+
+    # Add a suffix to print " is in xxx days", etc.
+    # Note the char(8) at the start to put the suffix
+    # on the same line as the reminder, and the final %
+    # in the argument of dosubst() to avoid an *extra*
+    # newline from being added
+    FSET msgsuffix(x) char(8) + dosubst(" is %b.%", $T)
+
+    # Include your holiday files here...
+    INCLUDE [$SysInclude]/holidays/us.rem
+    INCLUDE [$SysInclude]/holidays/us/ny.rem
+
+    # Restore old version of msgsuffix and $DefaultDelta
+    FRENAME saved_msgsuffix msgsuffix
+    SET $DefaultDelta old_delta

include/holidays/ad.rem

@@ -3,12 +3,14 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Andorra.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ad/
+# [$SysInclude]/holidays/ad/
 
 OMIT 1 January MSG New Year's Day
 OMIT 6 January MSG Epiphany

include/holidays/ad/02.rem

@@ -5,10 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 02.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
-REM Third Saturday in July SCANFROM -28 ADDOMIT MSG Canillo Annual Festival
+REM Third Saturday in July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Sunday 16 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Monday 17 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival

include/holidays/ad/03.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 03.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
 OMIT 15 August MSG Encamp Annual Festival
 OMIT 16 August MSG Encamp Annual Festival

include/holidays/ad/04.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 04.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
 OMIT 15 August MSG La Massana Annual Festival
 OMIT 16 August MSG La Massana Annual Festival

include/holidays/ad/05.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 05.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
 OMIT 15 August MSG Ordino Annual Festival
 OMIT 16 August MSG Ordino Annual Festival

include/holidays/ad/06.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 06.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
 REM Friday 23 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
 REM Saturday 24 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival

include/holidays/ad/07.rem

@@ -5,10 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 07.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
-REM First Saturday in August SCANFROM -28 ADDOMIT MSG Andorra la Vella Annual Festival
+REM First Saturday in August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Sunday 2 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Monday 3 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival

include/holidays/ad/08.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 08.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem
 
 OMIT 25 July MSG Escaldes-Engordany Annual Festival
 OMIT 26 July MSG Escaldes-Engordany Annual Festival

include/holidays/ae.rem

@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for UnitedArabEmirates
+# Holiday file for United Arab Emirates
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG رأس السنة الميلادية
 OMIT 2 December MSG اليوم الوطني

include/holidays/al.rem

@@ -2,6 +2,8 @@
 # Holiday file for Albania
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Festat e Vitit të Ri
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)

include/holidays/am.rem

@@ -2,6 +2,8 @@
 # Holiday file for Armenia
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Նոր տարվա օր
 OMIT 2 January MSG Նոր տարվա օր

include/holidays/ao.rem

@@ -2,38 +2,40 @@
 # Holiday file for Angola
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Dia do Ano Novo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
-REM 3 February SCANFROM -28 ADDOMIT 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(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)
 OMIT 4 February MSG Dia do Início da Luta Armada de Libertação Nacional
-REM 5 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-REM 12 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
-REM 14 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
+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)
 OMIT [easterdate($Uy)-47] MSG Dia do Carnaval
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
 OMIT 8 March MSG Dia Internacional da Mulher
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
+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)
 OMIT 23 March MSG Dia da Libertação da África Austral
-REM 24 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
+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)
 OMIT 4 April MSG Dia da Paz e Reconciliação Nacional
-REM 5 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT [easterdate($Uy)-2] MSG Sexta-Feira Santa
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
 OMIT 1 May MSG Dia Internacional do Trabalhador
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
-REM 16 September SCANFROM -28 ADDOMIT 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(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)
 OMIT 17 September MSG Dia do Fundador da Nação e do Herói Nacional
-REM 18 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
+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)
 OMIT 2 November MSG Dia dos Finados
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
+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)
 OMIT 11 November MSG Dia da Independência Nacional
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
+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)
 OMIT 25 December MSG Dia de Natal e da Família
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
+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)

include/holidays/ar.rem

@@ -2,6 +2,8 @@
 # Holiday file for Argentina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Año Nuevo
 OMIT [easterdate($Uy)-48] MSG Día de Carnaval
@@ -11,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 SCANFROM -28 ADDOMIT 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-OMIT 17 June MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes
+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 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 SCANFROM -28 ADDOMIT 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(date($Ty, 6, 17)) == 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-OMIT 17 August MSG Paso a la Inmortalidad del General Don José de San Martin
-REM 20 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 21 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
-OMIT 12 October MSG Día del Respeto a la Diversidad Cultural
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
-REM 18 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
-REM 19 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
-OMIT 20 November MSG Día de la Soberanía Nacional
-REM 23 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
-REM 24 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
+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 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 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 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)
 OMIT 8 December MSG Inmaculada Concepción de María
 OMIT 25 December MSG Navidad

include/holidays/as.rem

@@ -1,36 +1,40 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for AmericanSamoa
+# Holiday file for American Samoa
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM 16 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 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)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 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)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+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)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+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)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day
-REM Second Sunday in October SCANFROM -28 ADDOMIT MSG White Sunday
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 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)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 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)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+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)
+
+# Optional holidays
 REM 14 February MSG Valentine's Day
 REM 17 March MSG Saint Patrick's Day
 REM 31 October MSG Halloween

include/holidays/at.rem

@@ -3,12 +3,14 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Austria.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/at/
+# [$SysInclude]/holidays/at/
 
 OMIT 1 January MSG Neujahr
 OMIT 6 January MSG Heilige Drei Könige
@@ -23,6 +25,8 @@ OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
 OMIT 25 December MSG Christtag
 OMIT 26 December MSG Stefanitag
+
+# Optional holidays
 REM [easterdate($Uy)-2] MSG Karfreitag
 REM 24 December MSG Heiliger Abend
 REM 31 December MSG Silvester

include/holidays/at/1.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 1.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 11 November MSG Hl. Martin

include/holidays/at/2.rem

@@ -5,9 +5,12 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 2.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef
 REM 10 October MSG Tag der Volksabstimmung

include/holidays/at/3.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 3.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 15 November MSG Hl. Leopold

include/holidays/at/4.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 4.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 4 May MSG Hl. Florian

include/holidays/at/5.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 5.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 24 September MSG Hl. Rupert

include/holidays/at/6.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 6.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/7.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 7.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/8.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 8.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 19 March MSG Hl. Josef

include/holidays/at/9.rem

@@ -5,8 +5,11 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision 9.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem
 
+
+# Optional holidays
 REM 15 November MSG Hl. Leopold

include/holidays/au.rem

@@ -3,12 +3,14 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Australia.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/au/
+# [$SysInclude]/holidays/au/
 
 OMIT 1 January MSG New Year's Day
 OMIT 26 January MSG Australia Day

include/holidays/au/act.rem

@@ -5,20 +5,23 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision ACT.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Canberra 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 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 SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday

include/holidays/au/nsw.rem

@@ -5,18 +5,21 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision NSW.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] 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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 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 SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday

include/holidays/au/nt.rem

@@ -5,21 +5,24 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision NT.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] 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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 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 SCANFROM -28 ADDOMIT MSG May Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Picnic Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)
+
+# Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
 REM 31 December MSG New Year's Eve (from 7pm)

include/holidays/au/qld.rem

@@ -5,18 +5,19 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision QLD.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] 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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 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 SCANFROM -28 ADDOMIT MSG Labour Day
+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 SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)

include/holidays/au/sa.rem

@@ -5,22 +5,25 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision SA.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Adelaide Cup 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 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 SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
+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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+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)
+
+# Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
 REM 31 December MSG New Year's Eve (from 7pm)

include/holidays/au/tas.rem

@@ -5,11 +5,12 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision TAS.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Eight Hours Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+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)

include/holidays/au/vic.rem

@@ -5,19 +5,20 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision VIC.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Labour 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 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 SCANFROM -28 ADDOMIT MSG King's Birthday
+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 SCANFROM -28 ADDOMIT MSG Melbourne Cup Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)

include/holidays/au/wa.rem

@@ -5,19 +5,20 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision WA.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# also include [$SysInclude]/holidays/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Labour 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 First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM 26 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
-REM 27 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
-REM First Monday in June SCANFROM -28 ADDOMIT MSG Western Australia Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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 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)

include/holidays/aw.rem

@@ -2,6 +2,8 @@
 # Holiday file for Aruba
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Aña Nobo
 OMIT 25 January MSG Dia di Betico

include/holidays/az.rem

@@ -2,6 +2,8 @@
 # Holiday file for Azerbaijan
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Yeni il bayramı
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Yeni il bayramı (müşahidə olunur)
@@ -34,6 +36,8 @@ OMIT 9 November MSG Azərbaycan Respublikasının Dövlət bayrağı günü
 REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 9))==0 || wkdaynum(date($Ty, 11, 9))==6] MSG Azərbaycan Respublikasının Dövlət bayrağı günü (müşahidə olunur)
 OMIT 31 December MSG Dünya azərbaycanlılarının həmrəyliyi günü
 REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31))==0 || wkdaynum(date($Ty, 12, 31))==6] MSG Dünya azərbaycanlılarının həmrəyliyi günü (müşahidə olunur)
+
+# Optional holidays
 REM 27 September MSG Anım Günü
 REM 18 October MSG Müstəqilliyin Bərpası Günü
 REM 12 November MSG Konstitusiya Günü

include/holidays/ba.rem

@@ -1,20 +1,22 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for BosniaAndHerzegovina
+# Holiday file for Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
-# holidays for BosniaAndHerzegovina.
+# holidays for Bosnia And Herzegovina.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ba/
+# [$SysInclude]/holidays/ba/
 
 OMIT 1 January MSG Nova godina
 OMIT 2 January MSG Nova godina
-OMIT [easterdate($Uy)-2] MSG Veliki petak (Pravoslavni)
-OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Katolički)
+OMIT 7 January MSG Božić (Pravoslavni)
+OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Pravoslavni)
+OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Katolički)
 OMIT 1 May MSG Međunarodni praznik rada
 OMIT 2 May MSG Međunarodni praznik rada
 OMIT 25 December MSG Božić (Katolički)
-OMIT 25 December MSG Božić (Pravoslavni)

include/holidays/ba/bih.rem

@@ -1,22 +1,23 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision BIH in BosniaAndHerzegovina
+# Holiday file for subdivision BIH in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
 # Note that this file includes only the holidays for
 # the specific subdivision BIH.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# also include [$SysInclude]/holidays/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+OMIT 6 January MSG Badnji dan (Pravoslavni)
 OMIT 1 March MSG Dan nezavisnosti
-OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
-OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
-OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
-OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+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)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 25 November MSG Dan državnosti
 OMIT 24 December MSG Badnji dan (Katolički)
-OMIT 24 December MSG Badnji dan (Pravoslavni)

include/holidays/ba/brc.rem

@@ -1,19 +1,20 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision BRC in BosniaAndHerzegovina
+# Holiday file for subdivision BRC in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
 # Note that this file includes only the holidays for
 # the specific subdivision BRC.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# also include [$SysInclude]/holidays/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
+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)
 OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
+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)

include/holidays/ba/srp.rem

@@ -1,22 +1,23 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for subdivision SRP in BosniaAndHerzegovina
+# Holiday file for subdivision SRP in Bosnia And Herzegovina
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
 # Note that this file includes only the holidays for
 # the specific subdivision SRP.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# also include [$SysInclude]/holidays/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+OMIT 6 January MSG Badnji dan (Pravoslavni)
 OMIT 14 January MSG Pravoslavna Nova godina
-OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
-OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
-OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
-OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+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)
 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)
-OMIT 24 December MSG Badnji dan (Pravoslavni)

include/holidays/bb.rem

@@ -2,25 +2,27 @@
 # Holiday file for Barbados
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 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)
 OMIT 21 January MSG Errol Barrow Day
-REM 22 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
+REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 21)) == 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
 OMIT 1 May MSG May Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 1 August MSG Emancipation Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Kadooment Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
-REM 3 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+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)
 OMIT 30 November MSG Independence Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+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)

include/holidays/bd.rem

@@ -2,6 +2,8 @@
 # Holiday file for Bangladesh
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 21 February MSG International Mother's language Day
 OMIT 17 March MSG Sheikh Mujibur Rahman's Birthday and Children's Day

include/holidays/be.rem

@@ -2,6 +2,8 @@
 # Holiday file for Belgium
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Nieuwjaar
 OMIT [easterdate($Uy)] MSG Pasen
@@ -15,6 +17,8 @@ OMIT 15 August MSG O. L. V. Hemelvaart
 OMIT 1 November MSG Allerheiligen
 OMIT 11 November MSG Wapenstilstand
 OMIT 25 December MSG Kerstmis
+
+# Optional holidays
 REM [easterdate($Uy)-2] MSG Goede Vrijdag
 REM [easterdate($Uy)+40] MSG Vrijdag na O. L. H. Hemelvaart
 REM 26 December MSG Banksluitingsdag

include/holidays/bf.rem

@@ -1,27 +1,29 @@
 # SPDX-License-Identifier: MIT
-# Holiday file for BurkinaFaso
+# Holiday file for Burkina Faso
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 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)
 OMIT 3 January MSG Revolution Day
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 5 August MSG Independence Day
-REM 6 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 31 October MSG Martyrs' Day
 OMIT 1 November MSG All Saints' Day
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+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)
 OMIT 11 December MSG Proclamation of Independence Day
-REM 12 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)

include/holidays/bg.rem

@@ -2,15 +2,17 @@
 # Holiday file for Bulgaria
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Нова година
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Нова година (почивен ден)
 OMIT 3 March MSG Ден на Освобождението на България от османско иго
 REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3))==0 || wkdaynum(date($Ty, 3, 3))==6] MSG Ден на Освобождението на България от османско иго (почивен ден)
-OMIT [easterdate($Uy)-2] MSG Велики петък
-OMIT [easterdate($Uy)-1] MSG Велика събота
-OMIT [easterdate($Uy)] MSG Великден
-OMIT [easterdate($Uy)+1] MSG Великден
+OMIT [orthodoxeaster($Uy)-2] MSG Велики петък
+OMIT [orthodoxeaster($Uy)-1] MSG Велика събота
+OMIT [orthodoxeaster($Uy)] MSG Великден
+OMIT [orthodoxeaster($Uy)+1] MSG Великден
 OMIT 1 May MSG Ден на труда и на международната работническа солидарност
 REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Ден на труда и на международната работническа солидарност (почивен ден)
 OMIT 6 May MSG Гергьовден, Ден на храбростта и Българската армия
@@ -27,4 +29,6 @@ OMIT 25 December MSG Рождество Христово
 REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Рождество Христово (почивен ден)
 OMIT 26 December MSG Рождество Христово
 REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26))==0 || wkdaynum(date($Ty, 12, 26))==6] MSG Рождество Христово (почивен ден)
+
+# Optional holidays
 REM 1 November MSG Ден на народните будители

include/holidays/bh.rem

@@ -2,6 +2,8 @@
 # Holiday file for Bahrain
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG رأس السنة الميلادية
 OMIT 1 May MSG عيد العمال

include/holidays/bi.rem

@@ -2,27 +2,29 @@
 # Holiday file for Burundi
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 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)
 OMIT 5 February MSG Unity Day
-REM 6 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
+REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
 OMIT 6 April MSG President Ntaryamira Day
-REM 7 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 8 June MSG President Nkurunziza Day
-REM 9 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
 OMIT 1 July MSG Independence Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 13 October MSG Prince Louis Rwagasore Day
-REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
 OMIT 21 October MSG President Ndadaye's Day
-REM 22 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
+REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
 OMIT 1 November MSG All Saints' Day
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)

include/holidays/bn.rem

@@ -2,19 +2,21 @@
 # Holiday file for Brunei
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Awal Tahun Masihi
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
+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)
 OMIT 23 February MSG Hari Kebangsaan
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
+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)
 OMIT 31 May MSG Hari Angkatan Bersenjata Diraja Brunei
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+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)
 OMIT 15 July MSG Hari Keputeraan KDYMM Sultan Brunei
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+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)
 OMIT 25 December MSG Hari Natal
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
+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)

include/holidays/bo.rem

@@ -3,28 +3,30 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Bolivia.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/bo/
+# [$SysInclude]/holidays/bo/
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 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 SCANFROM -28 ADDOMIT 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(date($Ty, 1, 22)) == 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 SCANFROM -28 ADDOMIT 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)) == 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
 OMIT 6 August MSG Día de la Independencia de Bolivia
-REM 7 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)

include/holidays/bo/b.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision B.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 18 November MSG Día del departamento de Beni

include/holidays/bo/c.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision C.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 14 September MSG Día del departamento de Cochabamba

include/holidays/bo/h.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision H.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 25 May MSG Día del departamento de Chuquisaca

include/holidays/bo/l.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision L.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 16 July MSG Día del departamento de La Paz

include/holidays/bo/n.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision N.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 11 October MSG Día del departamento de Pando

include/holidays/bo/o.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision O.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro

include/holidays/bo/p.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision P.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 10 November MSG Día del departamento de Potosí

include/holidays/bo/s.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision S.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 24 September MSG Día del departamento de Santa Cruz

include/holidays/bo/t.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision T.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem
 
 OMIT 15 April MSG La Tablada

include/holidays/br.rem

@@ -3,12 +3,14 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Brazil.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/br/
+# [$SysInclude]/holidays/br/
 
 OMIT 1 January MSG Confraternização Universal
 OMIT [easterdate($Uy)-2] MSG Sexta-feira Santa
@@ -20,6 +22,8 @@ OMIT 2 November MSG Finados
 OMIT 15 November MSG Proclamação da República
 OMIT 20 November MSG Dia Nacional de Zumbi e da Consciência Negra
 OMIT 25 December MSG Natal
+
+# Optional holidays
 REM [easterdate($Uy)-48] MSG Carnaval
 REM [easterdate($Uy)-47] MSG Carnaval
 REM [easterdate($Uy)-46] MSG Início da Quaresma

include/holidays/br/ac.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision AC.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 REM 23 January ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia do Evangélico
 REM Friday 23 January ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 1, 23)) >= 2 && wkdaynum(date($Ty, 1, 23)) <= 4] MSG Dia do Evangélico

include/holidays/br/al.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision AL.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 24 June MSG São João
 OMIT 29 June MSG São Pedro

include/holidays/br/am.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision AM.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 5 September MSG Elevação do Amazonas à categoria de província

include/holidays/br/ap.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision AP.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 19 March MSG São José
 OMIT 25 July MSG São Tiago

include/holidays/br/ba.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision BA.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 2 July MSG Independência da Bahia

include/holidays/br/ce.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision CE.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 19 March MSG São José
 OMIT 25 March MSG Abolição da escravidão no Ceará

include/holidays/br/df.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision DF.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 21 April MSG Fundação de Brasília
 OMIT 30 November MSG Dia do Evangélico

include/holidays/br/es.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision ES.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT [easterdate($Uy)+8] MSG Nossa Senhora da Penha

include/holidays/br/go.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision GO.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 26 July MSG Fundação da cidade de Goiás
 OMIT 24 October MSG Pedra fundamental de Goiânia

include/holidays/br/ma.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision MA.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 28 July MSG Adesão do Maranhão à independência do Brasil

include/holidays/br/mg.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision MG.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 21 April MSG Execução de Tiradentes

include/holidays/br/ms.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision MS.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 11 October MSG Criação do Estado

include/holidays/br/pa.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision PA.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 15 August MSG Adesão do Grão-Pará à independência do Brasil

include/holidays/br/pb.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision PB.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 5 August MSG Fundação do Estado

include/holidays/br/pe.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision PE.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
-REM First Sunday in March SCANFROM -28 ADDOMIT MSG Revolução Pernambucana
+REM First Sunday in March ADDOMIT SCANFROM -28 MSG Revolução Pernambucana

include/holidays/br/pi.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision PI.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 19 October MSG Dia do Piauí

include/holidays/br/pr.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision PR.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 19 December MSG Emancipação do Paraná

include/holidays/br/rj.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision RJ.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 23 April MSG São Jorge

include/holidays/br/rn.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision RN.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 7 August MSG Dia do Rio Grande do Norte
 OMIT 3 October MSG Mártires de Cunhaú e Uruaçuu

include/holidays/br/ro.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision RO.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 4 January MSG Criação do Estado
 OMIT 18 June MSG Dia do Evangélico

include/holidays/br/rr.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision RR.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 5 October MSG Criação do Estado

include/holidays/br/rs.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision RS.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 20 September MSG Dia do Gaúcho

include/holidays/br/sc.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision SC.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 REM Sunday 11 August ADDOMIT SCANFROM -28 MSG Dia do Estado de Santa Catarina
 REM Sunday 25 November ADDOMIT SCANFROM -28 MSG Dia de Santa Catarina de Alexandria

include/holidays/br/se.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision SE.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 8 July MSG Emancipação política de Sergipe

include/holidays/br/sp.rem

@@ -5,8 +5,9 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision SP.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 9 July MSG Revolução Constitucionalista

include/holidays/br/to.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision TO.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem
 
 OMIT 18 March MSG Dia da Autonomia
 OMIT 8 September MSG Nossa Senhora da Natividade

include/holidays/bs.rem

@@ -2,23 +2,25 @@
 # Holiday file for Bahamas
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 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)
 OMIT 10 January MSG Majority Rule Day
-REM 11 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
-REM 12 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
+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)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Friday in June SCANFROM -28 ADDOMIT MSG Randol Fawkes Labour Day
+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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
-REM 12 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG National Heroes 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 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)

include/holidays/bw.rem

@@ -2,28 +2,30 @@
 # Holiday file for Botswana
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (observed)
+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)
 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
+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
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 1 July MSG Sir Seretse Khama Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
-REM Third Monday in July SCANFROM -28 ADDOMIT MSG President's Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
+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)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
+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

include/holidays/by.rem

@@ -2,14 +2,16 @@
 # Holiday file for Belarus
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
 OMIT 1 January MSG Новы год
 OMIT 2 January MSG Новы год
+OMIT 7 January MSG Нараджэнне Хрыстова (праваслаўнае Раство)
 OMIT 8 March MSG Дзень жанчын
-OMIT [easterdate($Uy)+9] MSG Радаўніца
+OMIT [orthodoxeaster($Uy)+9] MSG Радаўніца
 OMIT 1 May MSG Свята працы
 OMIT 9 May MSG Дзень Перамогі
 OMIT 3 July MSG Дзень Незалежнасці Рэспублікі Беларусь (Дзень Рэспублікі)
 OMIT 7 November MSG Дзень Кастрычніцкай рэвалюцыі
 OMIT 25 December MSG Нараджэнне Хрыстова (каталіцкае Раство)
-OMIT 25 December MSG Нараджэнне Хрыстова (праваслаўнае Раство)

include/holidays/bz.rem

@@ -2,40 +2,42 @@
 # Holiday file for Belize
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
 
-OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 15 January MSG George Price Day
-REM 16 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
-REM 6 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
-REM 8 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
-OMIT 9 March MSG National Heroes and Benefactors Day
-REM 10 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
-REM 12 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
+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 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 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)
 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
-REM 30 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
-REM 31 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
-OMIT 1 August MSG Emancipation Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
-REM 4 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
-OMIT 10 September MSG Saint George's Caye Day
-REM 11 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
-OMIT 21 September MSG Independence Day
-REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
-REM 9 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 12 October MSG Indigenous Peoples' Resistance Day
-REM 13 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 19 November MSG Garifuna Settlement Day
-REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
+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 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 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 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 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 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)
 OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+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)

include/holidays/ca.rem

@@ -3,33 +3,35 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 #
+# See important caveats in the README file in this directory.
+#
 # Note: This file consists only of the country-wide
 # holidays for Canada.
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ca/
+# [$SysInclude]/holidays/ca/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] 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 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 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 SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labour 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 First Monday in September ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 30 September MSG National Day for Truth and Reconciliation
-REM 1 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Thanksgiving Day
+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 Second Monday in October ADDOMIT SCANFROM -28 MSG Thanksgiving Day
 OMIT 11 November MSG Remembrance Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
-REM 13 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
+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)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+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)

include/holidays/ca/ab.rem

@@ -5,10 +5,13 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision AB.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+
+# Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday
 REM First Monday in August SCANFROM -28 MSG Heritage Day

include/holidays/ca/bc.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision BC.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG British Columbia Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG British Columbia Day

include/holidays/ca/mb.rem

@@ -5,9 +5,12 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision MB.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Louis Riel Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Louis Riel Day
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Terry Fox Day

include/holidays/ca/nb.rem

@@ -5,9 +5,10 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision NB.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG New Brunswick Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG New Brunswick Day

include/holidays/ca/nl.rem

@@ -5,11 +5,14 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision NL.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
 OMIT 1 July MSG Memorial Day
+
+# Optional holidays
 REM Monday 14 March SCANFROM -28 MSG Saint Patrick's Day
 REM Monday 20 April SCANFROM -28 MSG Saint George's Day
 REM Monday 21 June SCANFROM -28 MSG Discovery Day

include/holidays/ca/ns.rem

@@ -5,9 +5,12 @@
 #
 # Note that this file includes only the holidays for
 # the specific subdivision NS.
+# See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Heritage Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Heritage Day
+
+# Optional holidays
 REM First Monday in August SCANFROM -28 MSG Natal Day