Add RETURN command

Suggestion from Hymie! on Remind mailing list.
Set release date.
2026-04-21 00:32:54 +02:00 · 2025-08-06 11:08:41 -04:00 · 2025-07-28 10:21:26 -04:00 · 2025-07-25 16:50:49 -04:00 · 2025-07-25 12:07:50 -04:00 · 2025-07-25 11:29:52 -04:00
699 changed files with 951490 additions and 9036 deletions
@@ -1,2 +0,0 @@
-
-liberapay: dskoll
@@ -1,7 +0,0 @@
-# Remind has moved
-
-For various reasons, I have decided to move Remind off GitHub.  This repo
-will be archived.  To create merge requests or issues, please visit
-Remind's new home at https://salsa.debian.org/dskoll/remind
-
-- Dianne Skoll
@@ -1,29 +0,0 @@
-# language: bash
---
-
-name: Remind unit tests
-
-on:
-  push
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Remind
-        uses: actions/checkout@v2
-      - name: Add test user
-        run: |
-          sudo adduser --home /home/testuser --gecos 'Test User' --disabled-password testuser
-      - name: Fix ownership
-        run: |
-          sudo chown -R testuser .
-      - name: Build
-        run: |
-          sudo su -c './configure && make' testuser
-      - name: Run Tests
-        run: |
-          sudo su -c 'make test' testuser
-      - name: Fix up permissions so GitHub does not complain
-        run: |
-          sudo chmod -R a+rwX .
@@ -23,7 +23,6 @@ rem2pdf/Makefile.old
 rem2pdf/Makefile.top
 rem2pdf/bin/rem2pdf
 scripts/tkremind
-set-irc-topic
 src/*.tar.gz*
 src/Makefile
 src/config.h
@@ -35,3 +34,4 @@ tests/test.out
 www/Makefile
 gmon.out
 tests/once.timestamp
+src/xlat.c
@@ -3,7 +3,7 @@ THE REMIND COPYRIGHT
 1. REMIND refers to the entire set of files and documentation in the
 REMIND package.

-2. REMIND is Copyright 1992-2024 Dianne Skoll, except where noted in
+2. REMIND is Copyright (C) 1992-2025 Dianne Skoll, except where noted in
 individual files.

 3. DISTRIBUTION AND USE
@@ -23,8 +23,7 @@ install:
 	@$(MAKE) -C rem2html install
 	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 clean:
-	find . -name '*~' -exec rm {} \;
-	-rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
+	-find . -name '*~' -exec rm {} \;
 	-$(MAKE) -C src clean
 	-$(MAKE) -C rem2pdf clean

@@ -43,8 +42,13 @@ install-stripped:
 test:
 	@$(MAKE) -C src -s test

+cppcheck:
+	@$(MAKE) -C src cppcheck
+
 distclean: clean
-	rm -f config.cache config.log config.status src/Makefile src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
+	-rm -f config.cache config.log config.status src/Makefile src/version.h src/config.h tests/test.out www/Makefile rem2pdf/Makefile.top rem2pdf/Makefile.old rem2pdf/Makefile rem2pdf/Makefile.PL rem2pdf/bin/rem2pdf rem2html/rem2html
+	-rm -f man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind
+	-rm -rf autom4te.cache rem2html/Makefile rem2html/rem2html.1

 src/Makefile: src/Makefile.in
 	./configure
@@ -1,78 +0,0 @@
-				REMIND
-
-Remind is a full-featured calendar/alarm program.  Copying policy is
-in the file "COPYRIGHT" in this directory.
-
-Installation notes for various operating systems are in "docs".  See
-the appropriate README file for installation on your system.
-
-Manual pages are in "man".
-
-----------------------------------------------------------------------------
-
-Quick UNIX installation instructions for the very impatient:
-
-If you have Tcl/Tk (wish 4.1 or higher) installed and are running X Windows:
--------------------------------------------------------------
-
-1) Type: wish ./build.tk from this directory.  Fill in the various
-   options and hit "Build Remind"
-
-2) Type: "make install" -- you may need to be root to do this.
-
-If you do NOT have Tcl/Tk or are NOT running X Windows:
-------------------------------------------------------
-
-1) Edit the file "src/custom.h" according to your preferences.
-
-2) Edit the file "src/lang.h" to choose a language.
-
-3) Type: "./configure"  (You can supply options; type "./configure --help"
-   for details.)
-
-4) Type: "make"
-
-5) Type: "make install" -- you may need to be root to do this.
-
-PREREQUISITES:
--------------
-
-Remind and rem2ps have no prerequisites beyond the standard C library and
-the standard math library.
-
-Rem2HTML requires the JSON::MaybeXS Perl module.
-Rem2PDF requires the JSON::MaybeXS, Pango and Cairo Perl modules.
-
- On Debian-like systems, these prerequisites may be installed with:
-
-    apt install libjson-maybexs-perl libpango-perl libcairo-perl
-
- On RPM-based systems, you need perl-Pango, perl-Cairo and perl-JSON-MaybeXS
-
- On Gentoo, you need dev-perl/Pango, dev-perl/Cairo and dev-perl/JSON-MaybeXS.
-
- On Arch linux, you need pango-perl, cairo-perl and perl-json-maybexs
-
-TkRemind requires Tcl/Tk and the tcllib library.
-
- On Debian-like systems, install with:
-
-    apt install tcl tk tcllib
-
- On RPM-based systems, you need tcl, tk and tcllib
-
- On Arch Linux, you need tk and tcllib.  The latter is available at
-  https://aur.archlinux.org/packages/tcllib
-
-If the little arrows for "Previous Month" and "Next Month" do not display
-correctly in TkRemind, you may need to install the Noto Fonts.  Install
-all of your distribution's Nonto Font-related packages.
-
- On Debian-like systems, install with:
-
-    apt install fonts-noto-core fonts-noto-color-emoji \
-        fonts-noto-extra fonts-noto-ui-core fonts-noto-ui-extra
-
-==========================================================================
-Contact info: mailto:dianne@skoll.ca
-Home page:    https://dianne.skoll.ca/projects/remind/
@@ -0,0 +1,96 @@
+# REMIND
+
+Remind is a full-featured calendar/alarm program.  Copying policy is
+in the file "COPYRIGHT" included with the source; Remind is licensed under
+the GNU General Public License, Vesion 2.
+
+## Prerequisites:
+
+remind and rem2ps have no prerequisites beyond the standard C library and
+the standard math library.
+
+rem2html requires the JSON::MaybeXS Perl module and rem2pdf
+requires the JSON::MaybeXS, Pango and Cairo Perl modules.
+
+- On Debian-like systems, these prerequisites may be installed with:
+
+    `apt install libjson-maybexs-perl libpango-perl libcairo-perl`
+
+- On RPM-based systems, you need `perl-Pango`, `perl-Cairo` and
+  `perl-JSON-MaybeXS`
+
+- On Gentoo, you need `dev-perl/Pango`, `dev-perl/Cairo` and
+  `dev-perl/JSON-MaybeXS`.
+
+- On Arch linux, you need `pango-perl`, `cairo-perl` and `perl-json-maybexs`
+
+TkRemind requires Tcl/Tk and the tcllib library.
+
+- On Debian-like systems, install with:
+
+    `apt install tcl tk tcllib`
+
+- On RPM-based systems, you need `tcl`, `tk` and `tcllib`
+
+- On Arch Linux, you need `tk` and `tcllib`.  The latter is available at
+  https://aur.archlinux.org/packages/tcllib
+
+If the little arrows for "Previous Month" and "Next Month" do not display
+correctly in TkRemind, you may need to install the Noto Fonts.  Install
+all of your distribution's Noto Font-related packages.
+
+- On Debian-like systems, install with:
+
+    `apt install fonts-noto-core fonts-noto-color-emoji fonts-noto-extra fonts-noto-ui-core fonts-noto-ui-extra`
+
+## Installation
+
+Remind can be installed with the usual:
+
+`./configure && make && make test && sudo make install`
+
+You can edit custom.h to configure some aspects of Remind.  Or, if
+you have Tcl/Tk installed, you can use the graphical build tool to
+edit custom.h on your behalf:
+
+`wish ./build.tk`
+
+## Usage
+
+Remind is a large and complex program.  You can read the full manual page
+with:
+
+`man remind`
+
+after installation.  However, the man page is long and detailed and is
+more of a reference than an introduction.  You can get an overview
+with a [slide deck](https://dianne.skoll.ca/projects/remind/download/remind-oclug.pdf)
+I made a while back.  There's also a (long) [YouTube video](https://www.youtube.com/watch?v=0SNgvsDvx7M) that serves as an
+introduction to Remind.
+
+## A Note about AI
+
+1. No part of Remind was written using AI of any type.<br><br>
+I certify that all of the C, Perl and Tcl code in Remind was written
+by a human being.  I certify that all code in `.rem` files other than
+ones under `include/holidays` was written by a human being.  The code
+under `include/holidays` was derived from the Python "holidays" library
+and I have no direct knowledge of the provenance of that library,
+though I suspect it's entirely or almost entirely human-written.
+
+2. No AI-generated patches or other sorts of contributions to Remind
+will be accepted.
+
+3. Remind's source code may not be used to train an AI model,
+including an LLM model, unless all of the output of said model is
+released under the GNU General Public License, version 2.  If you use
+any of Remind's source code to train your model, then anything that
+the model produces is a derived product of Remind and must be licensed
+under the same terms as Remind.
+
+---
+
+Contact info: dianne@skoll.ca
+
+Home page:    [https://dianne.skoll.ca/projects/remind/](https://dianne.skoll.ca/projects/remind/)
+
@@ -8,7 +8,7 @@
 #   A cheesy graphical front-end for building and installing REMIND.
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-2018 Dianne Skoll
+#   Copyright (C) 1992-2025 Dianne Skoll
 #
 #--------------------------------------------------------------

@@ -40,7 +40,6 @@ proc SetConfigDefaults {} {
    set Config(TIMESEP) ":"
    set Config(NORTHERN_HEMISPHERE) 1
    set Config(WESTERN_HEMISPHERE) 1
-    set Config(LANGUAGE) "English"
    set Config(INST_DIR) "/usr/local/bin"
    set Config(MAN_DIR) "/usr/local/share/man"
 }
@@ -242,32 +241,6 @@ proc CreateOptionsDialog { w } {

    grid configure $w.timelabel -row 2 -column 0 -sticky e
    grid configure $w.time -row 2 -column 1 -sticky nsew
-
-    label $w.langlabel -text "Language: "
-    menubutton $w.lang -text $Config(LANGUAGE) -indicatoron 1 -relief raised \
-	    -menu $w.lang.menu
-    menu $w.lang.menu -tearoff 0
-    foreach lang {
-	"Brazilian Portuguese"
-	"Danish"
-	"Dutch"
-	"English"
-	"Finnish"
-	"French"
-	"German"
-	"Italian"
-	"Norwegian"
-	"Polish"
-	"Romanian"
-        "Spanish"
-	"Icelandic"
-    } {
-	$w.lang.menu add command -label $lang -command [list $w.lang configure -text $lang]
-    }
-
-    grid configure $w.langlabel -row 3 -column 0 -sticky e
-    grid configure $w.lang -row 3 -column 1 -sticky nsew
-
 }

 #***********************************************************************
@@ -491,32 +464,16 @@ proc CreateCustomH {} {
 # %RETURNS:
 #  Nothing
 # %DESCRIPTION:
-#  Runs "make" with appropriate language definitions
+#  Runs "make"
 #***********************************************************************
 proc CallMake {} {
    global Options
-    set lang [$Options.lang cget -text]
-    switch -- $lang {
-	"German"               { set lang GERMAN }
-	"Dutch"                { set lang DUTCH }
-	"Finnish"              { set lang FINNISH }
-	"French"               { set lang FRENCH }
-	"Norwegian"            { set lang NORWEGIAN }
-	"Danish"               { set lang DANISH }
-	"Polish"               { set lang POLISH }
-	"Brazilian Portuguese" { set lang BRAZPORT }
-	"Italian"              { set lang ITALIAN }
-	"Romanian"             { set lang ROMANIAN }
-        "Spanish"              { set lang SPANISH }
-	"Icelandic"            { set lang ICELANDIC }
-	default                { set lang ENGLISH }
-    }
    set nproc 0
    catch { set nproc [exec nproc] }
    if { $nproc != 0 } {
-        RunCommand "make -j $nproc \"LANGDEF=-DLANG=$lang\""
+        RunCommand "make -j $nproc"
    } else {
-        RunCommand "make \"LANGDEF=-DLANG=$lang\""
+        RunCommand "make"
    }
 }

@@ -530,7 +487,7 @@ proc CallMake {} {
 #    Michael McLennan, Bell Labs Innovations for Lucent Technologies
 #    Addison-Wesley Professional Computing Series
 # ======================================================================
-#  Copyright (c) 1996-1997  Lucent Technologies Inc. and Mark Harrison
+#  Copyright (C) 1996-1997  Lucent Technologies Inc. and Mark Harrison
 # ======================================================================

 option add *Tabnotebook.tabs.background #666666 widgetDefault
@@ -644,7 +601,7 @@ proc tabnotebook_display {win name} {
 #    Michael McLennan, Bell Labs Innovations for Lucent Technologies
 #    Addison-Wesley Professional Computing Series
 # ======================================================================
-#  Copyright (c) 1996-1997  Lucent Technologies Inc. and Mark Harrison
+#  Copyright (C) 1996-1997  Lucent Technologies Inc. and Mark Harrison
 # ======================================================================

 option add *Notebook.borderWidth 2 widgetDefault
@@ -786,7 +743,6 @@ proc SetConfigFromRemind {} {
    QueryRemind $rem LOCATION {$Location}
    QueryRemind $rem DATESEP {$DateSep}
    QueryRemind $rem TIMESEP {$TimeSep}
-    QueryRemind $rem LANGUAGE {language()}

    set $Config(LAT_MIN) [expr abs($Config(LAT_MIN))]
    set $Config(LAT_SEC) [expr abs($Config(LAT_SEC))]
@@ -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.05.00, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])

 cat <<'EOF'
@@ -110,14 +110,17 @@
 (defconst remind-keywords
  (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"
-         "FUNSET" "IF" "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "LAST"
-         "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF" "MSG"
-         "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP" "POP-OMIT-CONTEXT" "PRESERVE"
-         "PRIORITY" "PS" "PSFILE" "PUSH" "PUSH-OMIT-CONTEXT" "REM" "RUN"
-         "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
-         "TAG" "THIRD" "THROUGH" "UNSET" "UNTIL" "WARN")
+         "CLEAR-OMIT-CONTEXT" "DEBUG" "DO" "DUMP" "DUMPVARS"
+         "DURATION" "ELSE" "ENDIF" "ERRMSG" "EXIT" "EXPR" "FIRST"
+         "FLUSH" "FOURTH" "FRENAME" "FROM" "FSET" "FUNSET" "IF"
+         "IFTRIG" "IN" "INC" "INCLUDE" "INCLUDECMD" "INFO" "LAST"
+         "LASTDAY" "LASTWORKDAY" "MAYBE" "MAYBE-UNCOMPUTABLE" "MSF"
+         "MSG" "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP"
+         "POP-OMIT-CONTEXT" "POP-FUNCS" "POP-VARS" "PRESERVE" "PRIORITY" "PS"
+         "PSFILE" "PUSH" "PUSH-FUNCS" "PUSH-VARS" "PUSH-OMIT-CONTEXT" "REM" "RETURN"
+         "RUN" "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET"
+         "SKIP" "SPECIAL" "SYSINCLUDE" "TAG" "THIRD" "THROUGH"
+         "TRANSLATE" "TRANS" "UNSET" "UNTIL" "WARN")
   #'(lambda (a b) (> (length a) (length b)))))


@@ -128,9 +131,10 @@

 (defconst remind-builtin-variables
  (sort
-   (list "$AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
-         "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DateTimeSep" "$December"
-         "$DefaultColor" "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
+   (list " $AddBlankLines" "$Ago" "$Am" "$And" "$April" "$At" "$August"
+         "$CalcUTC" "$CalMode" "$CalType" "$Daemon" "$DateSep" "$DateTimeSep"
+         "$December" "$DedupeReminders" "$DefaultColor" "$DefaultDelta"
+         "$DefaultPrio" "$DefaultTDelta" "$DeltaOverride"
         "$DontFork" "$DontQueue" "$DontTrigAts" "$EndSent" "$EndSentIg"
         "$ExpressionTimeLimit" "$February" "$FirstIndent" "$FoldYear"
         "$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode"
@@ -143,8 +147,8 @@
         "$NumTrig" "$October" "$On" "$OnceFile" "$ParseUntriggered" "$Pm"
         "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday" "$September"
         "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime" "$SubsIndent"
-         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Td"
-         "$TerminalBackground" "$Thursday" "$TimeSep" "$Tm" "$Today"
+         "$Sunday" "$SuppressImplicitWarnings" "$SuppressLRM" "$SysInclude" "$T" "$Tb" "$Td"
+         "$TerminalBackground" "$Thursday" "$TimeSep" "$TimetIs64bit" "$Tm" "$Today"
         "$Tomorrow" "$Tt" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um"
         "$UntimedFirst" "$Use256Colors" "$UseBGVTColors" "$UseTrueColors"
         "$UseVTColors" "$Uw" "$Uy" "$Was" "$Wednesday")
@@ -161,24 +165,26 @@

 (defconst remind-builtin-functions
  (sort
-   (list "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
-         "baseyr" "char" "choose" "coerce" "columns" "current" "date"
+   (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
+         "baseyr" "catch" "catcherr" "char" "choose" "coerce" "columns" "const" "current" "date"
         "datepart" "datetime" "dawn" "day" "daysinmon" "defined" "dosubst"
-         "dusk" "easterdate" "evaltrig" "filedate" "filedatetime" "filedir"
-         "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour"
-         "htmlescape" "htmlstriptags" "iif" "index" "isany" "isdst" "isleap"
-         "isomitted" "language" "localtoutc" "lower" "max" "min" "minsfromutc"
-         "minute" "mon" "monnum" "moondate" "moondatetime" "moonphase"
-         "moontime" "multitrig" "ndawn" "ndusk" "nonomitted" "now" "ord"
-         "orthodoxeaster" "ostype" "pad" "plural" "psmoon" "psshade"
-         "realcurrent" "realnow" "realtoday" "rows" "sgn" "shell" "shellescape"
-         "slide" "soleq" "stdout" "strlen" "substr" "sunrise" "sunset" "time"
-         "timepart" "timezone" "today" "trig" "trigback" "trigdate"
-         "trigdatetime" "trigdelta" "trigduration" "trigeventduration"
-         "trigeventstart" "trigfrom" "trigger" "trigpriority" "trigrep"
+         "dusk" "easterdate" "escape" "eval" "evaltrig" "filedate" "filedatetime"
+         "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear"
+         "hour" "htmlescape" "htmlstriptags" "iif" "index" "isany" "isconst" "isdst"
+         "isleap" "isomitted" "language" "localtoutc" "lower" "max" "min"
+         "minsfromutc" "minute" "mon" "monnum" "moondate" "moondatetime"
+         "moonphase" "moonrise" "moonrisedir" "moonset" "moonsetdir" "moontime"
+         "multitrig" "ndawn" "ndusk" "nonconst" "nonomitted" "now" "ord" "orthodoxeaster"
+         "ostype" "pad" "plural" "psmoon" "psshade" "realcurrent" "realnow"
+         "realtoday" "rows" "sgn" "shell" "shellescape" "slide" "soleq"
+         "stdout" "strlen" "substr" "sunrise" "sunset" "time" "timepart"
+         "timezone" "today" "trig" "trigback" "trigbase" "trigdate" "trigdatetime"
+         "trigdelta" "trigduration" "trigeventduration" "trigeventstart"
+         "trigfrom" "trigger" "triginfo" "trigpriority" "trigrep"
         "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
         "triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
-         "value" "version" "weekno" "wkday" "wkdaynum" "year")
+         "value" "version" "weekno" "wkday" "wkdaynum" "year"
+         )
   #'(lambda (a b) (> (length a) (length b)))))

 ;;; faces
@@ -187,21 +193,21 @@
 (defvar remind-conf-command-face 'remind-conf-command-face
  "Remind commands.")
 (defface remind-conf-command-face
-  '((t :foreground "SeaGreen4" :bold t))
+  '((t :foreground "#FF8080"))
  "Font Lock mode face used to highlight commands."
  :group 'remind-conf)

 (defvar remind-conf-keyword-face 'remind-conf-keyword-face
  "Remind keywords.")
 (defface remind-conf-keyword-face
-  '((t :foreground "blue violet"))
+  '((t :foreground "#FFFF80"))
  "Font Lock mode face used to highlight keywords."
  :group 'remind-conf)

 (defvar remind-conf-substitutes-face 'remind-conf-substitutes-face
  "Remind substitutes.")
 (defface remind-conf-substitutes-face
-  '((t :foreground "blue2"))
+  '((t :foreground "#8080FF"))
  "Font Lock mode face used to highlight substitutes."
  :group 'remind-conf)

@@ -215,7 +221,7 @@
 (defvar remind-conf-variable-face 'remind-conf-variable-face
  "Remind variable.")
 (defface remind-conf-variable-face
-  '((t :foreground "DeepPink2" :bold t))
+  '((t :foreground "#FF8080" :bold t))
  "Font Lock mode face used to highlight commands."
  :group 'remind-conf)

@@ -236,14 +242,14 @@
 (defvar remind-comment-face 'remind-comment-face
  "Remind comments.")
 (defface remind-comment-face
-  '((t :foreground "brown"))
+  '((t :foreground "#FF7F24"))
  "Font-lock face for highlighting comments."
  :group 'remind-conf)

 (defvar remind-string-face 'remind-string-face
  "Remind strings.")
 (defface remind-string-face
-  '((t :foreground "tomato"))
+  '((t :foreground "#FF7FE0"))
  "Font lock mode face used to highlight strings."
  :group 'remind-conf)

@@ -295,11 +301,11 @@
 (defconst remind-conf-font-lock-keywords-1
  (list
   '("^\s*[\;\#].*$" . remind-comment-face)
+   '("\"[^\"]*\"" . remind-string-face)
   '(remind-keywords-matcher . remind-conf-keyword-face)
   '("%[\"_]" . font-lock-warning-face)
-   '("\\(%[a-mops-w]\\)" . remind-conf-substitutes-face)
-   '("\"[^\"]*\"" . remind-string-face))
-  "Minimal font-locking for `remind-conf-mode'.")
+   '("\\(%[a-z]\\)" . remind-conf-substitutes-face)
+  "Minimal font-locking for `remind-conf-mode'."))

 (defconst remind-conf-font-lock-keywords-2
  (append remind-conf-font-lock-keywords-1
@@ -1,6 +1,6 @@
-REMIND version 3.2 for UNIX
+Remind for UNIX and Linux

-REMIND is a sophisticated alarm/calendar program.  Details are given
+Remind is a sophisticated alarm/calendar program.  Details are given
 in the man page, "remind.1".

 INSTALLING REMIND:
@@ -19,88 +19,13 @@ If you do NOT have Tcl/Tk or are NOT running X11:

 1) Edit the file "src/custom.h" according to your preferences.

-2) Edit the file "src/lang.h" to choose a language.
+2) Type: "make"

-3) Type: "make"
-
-4) Type: "make install" -- you may need to be root to do this.
+3) Type: "make install" -- you may need to be root to do this.

 The subdirectory "www" contains scripts for making a nice calendar
 web server.  See the files README and Makefile in that directory.

-The file "examples/defs.rem" has some sample Remind definitions and
-commands, as well as U.S. and Jewish holidays.
-
-OTHER LANGUAGE SUPPORT
-
-Remind has support for languages other than English.  See the file
-"src/lang.h" for details.  The language support may vary - you can change
-only the substitution filter, or you can translate all of the usage
-instructions and error messages as well.  See "src/langs/french.h" for an
-example of the latter.
-
-To compile Remind for a non-english language, look at the constants
-defined in "src/lang.h".  Then, to compile Remind for Italian (as an
-example), type:
-
-	make "LANGDEF=-DLANG=ITALIAN"
-
-If you add support for a non-English language, Remind will accept both the
-English and non-English names of months and weekdays in an input script.
-However, you should not rely on this feature if you want to write portable
-Remind scripts.
-
-At a minimum, you should support month and day names in the foreign
-language, and should modify the substitution filter appropriately.
-If you are truly diligent, you can translate usage and error messages
-too.
-
-Take a look at the files "src/langs/english.h" and
-"src/langs/german.h" if you want to add support for your favourite
-language.  If you do add another language to Remind, please let me
-know!  Here are the basic guidelines:
-
- Your language file should be called "src/langs/lxxx.h", where lxxx
-  is the first 8 characters of the ENGLISH name of your language.
-
- Your language file should define L_LANGNAME to be the full English
-  name of your language, with the first letter capitalized and the rest
-  lower-case.
-
- You can test your language file with the script "tests/tstlang.rem"
-
- Your localized strings must be encoded using UTF-8.
-
-RELEASE NOTES -- miscellaneous info that couldn't go anywhere else!
-
-1. POPUP REMINDERS
-
-If you're running under X11 and you have the Tcl tools, you can create
-simple pop-up reminders by creating the following Tcl script called
-'popup'.  It pops a message on to the screen and waits for you to
-press the 'OK' button.  If you don't press the OK button within 15
-seconds, it exits anyway.  To use it, you can use the '-k' option for
-Remind as follows:
-
-	remind "-kpopup '%s'&" .reminders
-
-Or use the following in your Remind script:
-
-	REM AT 17:00 RUN popup 'Time to go home.' &
-
-This Tcl script is a slightly modified version of one submitted by
-Norman Walsh.
-
-------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
-#!/usr/local/bin/wish
-wm withdraw .
-after 15000 { destroy . ; exit }
-tk_messageBox -message Message -detail $argv -icon info -type ok
-destroy .
-exit
-------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
-
-
 --
 Dianne Skoll <dianne@skoll.ca>
 https://dianne.skoll.ca/projects/remind/
@@ -1,5 +1,399 @@
 CHANGES TO REMIND

+* VERSION 5.5 Patch 0 - 2025-07-28
+
+- NEW FEATURE: remind:  Add the PUSH-VARS / POP-VARS commands and the
+  analogous PUSH-FUNCS / POP-FUNCS commands.  These let you localize
+  changes to variables and functions and help with writing more modular
+  reminder files.
+
+- INTERNAL CHANGES: Clean up the code following recommendations from
+  an updated "cppcheck" executable.
+
+* VERSION 5.4 Patch 2 - 2025-07-16
+
+- MINOR CHANGE: remind: Allow daysinmon() to take a DATE or DATETIME
+  argument.
+
+- MINOR CHANGE: remind: All functions that want an integer month number
+  will now also accept a string naming the month.
+
+= UPDATE: include/holidays/chinese-new-year.rem: Add dates for Chinese
+  New Year for 2051 through 2100.
+
+- BUG FIX: remind: Set trigdate() correctly for a fully-specified
+  date, even if it's in the past, as the manual documented.  Bug
+  found by Tim Chase.
+
+- DOCUMENTATION FIX: rem2html: Document the correct Perl module
+  prerequisites.
+
+- CODE FIXES: remind: Various minor improvements to the code with
+  no user-visible changes.
+
+* VERSION 5.4 Patch 1 - 2025-06-15
+
+- MAJOR BUG FIX: remind: In some circumstances, a REM command could
+  yield a trigger date after its UNTIL date, rather than recognizing it
+  as having expired.  This has been fixed.  Bug found by Ian! D. Allen.
+
+- BUG FIX: rem2pdf: Support the COLOUR special (as well as COLOR).
+
+- MINOR IMPROVEMENT: Add include/utils/add-html-anchors.rem.  You can
+  INCLUDE this file to get HTML anchors added to every calendar day
+  by rem2html.
+
+- DOCUMENTATION: Add NOTE-ABOUT-AI.txt
+
+* VERSION 5.4 Patch 0 - 2025-06-03
+
+- MAJOR IMPROVEMENT: remind: Track which expressions and variables
+  Remind can prove to its satisfaction are "constant" - that is, that
+  will always have the same value on any Remind run as long as the
+  files are not edited.  This allows "Purge Mode" to purge more
+  reminders than before.
+
+  See the new remind(1) man page section "NON-CONSTANT EXPRESSIONS"
+
+- MINOR NEW FEATURE: remind: add the "nonconst" built-in function (to
+  force an expression to be interpreted as non-constant), the "const"
+  function to force an expression to be interpreted as constant, and
+  the "isconst" function to test if an expression is constant.
+
+- MINOR NEW FEATURE: remind: Add eval() built-in function that takes a
+  string argument and evaluates it as an expression.  For safety, the
+  "shell" function is disabled inside an eval().
+
+- MINOR NEW FEATURE: remind: add the "u" debugging flag to warn you if
+  you set a variable that is not subsequently used.
+
+- MINOR NEW FEATURE: remind: Add the trigbase() function and
+  corresponding $Tb system variable.  See the remind(1) man page for
+  details.
+
+- MINOR IMPROVEMENT: remind: make value("var", default) evaluate the
+  second argument lazily: If "var" is defined, then the second
+  argument is never evaluated.
+
+- MINOR IMPROVEMENT: remind: Add syntax for redefining a function without
+  issuing a warning.  The syntax:
+
+      FSET - func(x) expr
+
+  is equivalent to:
+
+      FUNSET func
+      FSET func(x) expr
+
+- MINOR IMPROVEMENT: include/holidays: Update a bunch of files to use
+  isany(n, a, b, c) rather than (n == a || n == b || n == c)
+
+- MINOR IMPROVEMENT: remind: Make $Tu a synonym for triguntil().
+
+- MINOR IMPROVEMENT: remind: If coerce() fails, issue a more detailed
+  error message.
+
+- MINOR IMPROVEMENT: remind: Using Hush mode "-h" with purge mode "-j"
+  suppresses the normal purge-mode diagnostics about reminders that
+  might not be purged.  Instead, only the "#!P: Expired" purge-mode
+  lines are emitted.
+
+- NEW FEATURE: remind: Add the catch() built-in function.  This lets
+  you catch errors in expression evaluation.  For example:
+  catch(2/0, "oops") returns "oops".  The catcherr() function returns
+  the error message from the last catch() expression that failed, in
+  this case "Division by zero".
+
+- IMPROVEMENT: remind: Remind can handle dates that require UTC to
+  Local conversion (and vice-versa) for years greater than 2038, even
+  on systems with a 32-bit time_t.
+
+- MINOR IMPROVEMENT: remind: Allow the argument to monnum() to be a
+  string, in which case it's parsed as a month name and the
+  corresponding month number returned.
+
+- MINOR IMPROVEMENT: remind: Allow the argument to wkdaynum() to be a
+  string, in which case it's parsed as a weekday name and the
+  corresponding weekday number returned.
+
+- MINOR IMPROVEMENT: remind: Make the expression parser optimize away
+  the unary "-" and "!" operators when followed by an integer constant.
+
+- BUG FIX: tests: Don't use the obsolete "tail +2" syntax in test-rem.
+  Fix courtesy of Dick Marinus.
+
+* VERSION 5.3 Patch 7 - 2025-05-06
+
+- IMPROVEMENT: examples/astro: Make moonrise/moonset appear after
+  sunrise/sunset
+
+- NEW FILES: Add include/solar-eclipses.rem and
+  include/lunar-eclipses.rem for solar and lunar eclipses
+  (respectively) in the 21st century.
+
+- NEW SYSTEM VARIABLE: remind: Add $TimetIs64bit system variable,
+  which is 1 if the built in time_t type is at least 64 bits, and 0
+  otherwise.
+
+- TEST FIX: "make test" now passes on systems with a 32-bit time_t
+  type.
+
+- BUG FIX: include/holidays/nl.rem: Use the correct rules for
+  Koningsdag and Bevrijdingsdag, courtesy of Adrian P. van Bloois.
+
+* VERSION 5.3 Patch 6 - 2025-04-25
+
+- BUG FIX: remind: Make "remind -s" respect $DefaultColor.  Bug found by
+  Tim Chase.
+
+- DOCUMENTATION IMPROVEMENT: Make documentation of $SuppressLRM a bit more
+  prominent
+
+- UPDATE: contrib/remind-conf-mode: Add new functions moonrise, moonset, etc.
+  to Emacs highlighting file
+
+- MINOR IMPROVEMENT: examples/astro: Align output better
+
+- MINOR FIX: src/moon.c: Change C++-style comments to C-style comments
+
+* VERSION 5.3 Patch 5 - 2025-03-23
+
+- NEW FEATURE: remind: Add moonrise, moonset, moonrisedir and moonsetdir
+  functions.  The first two functions calculate the time of the next
+  moonrise and moonset, and the second two calculate in which direction
+  the moon will rise or set.  See the examples/astro script for examples
+  of how to use the moonrise/moonset functions.
+
+- CODE CLEANUPS: remind: Some minor code cleanups with no user-visible effects.
+
+- IMPROVEMENT: Add tests for the astronomical calculation functions.
+
+- UPDATE: Update the included json.c and json.h files to the latest versions
+  from https://github.com/udp/json-parser
+
+- BUG FIX: remind: The %2 and %@ sequences would print "0:34am" for the
+  time 00:34, instead of the correct "12:34am".  This has been fixed.
+
+- BUG FIX: TkRemind: Fix bug that broke the ability to open a text editor
+  on a reminder from the "Queue..." listing.
+
+* VERSION 5.3 Patch 4 - 2025-03-09
+
+- BUG FIX: remind: "make test" could fail if Remind was built in a locale
+  other than "C".  This has been fixed.
+
+- BUG FIX: Fix a typo in the remind man page.
+
+* VERSION 5.3 Patch 3 - 2025-03-03
+
+- NEW FEATURE: remind: If a command spans more than one line (because of
+  backslash line continuation) output both the starting and ending line
+  number in error messages.
+
+- NEW FEATURE: remind: In the JSON -pp and -ppp output, include a new key
+  lineno_start to specify the starting line of a multi-line reminder.
+  The existing lineno key specifies the ending line; this is maintained
+  for backward-compatibility.
+
+- MINOR IMPROVEMENT: include/holidays/misc.rem: Add a few new holidays and
+  URL INFO strings.
+
+- CHANGE: remind: Issue a warning if a time-related substitution sequence
+  is used with a non-timed REM command.
+
+- BUG FIX: remind: Fix a memory leak.
+
+* VERSION 5.3 Patch 2 - 2025-02-09
+
+- CHANGE: remind: Revert a change to the way "-y" tags are generated that
+  was introduced in 05.03.01.  The change broke a library that depended
+  on it being generated in the old way.
+
+* VERSION 5.3 Patch 1 - 2025-02-07
+
+- IMPROVEMENT: TkRemind: When we pop up a timed reminder, make any "Url:"
+  info string into a clickable link.
+
+- IMPROVEMENT: rem2pdf: Improve the layout of the small monthly calendars.
+
+- BUG FIX: rem2pdf: Add checks for all Perl dependencies.
+
+* VERSION 5.3 Patch 0 - 2025-02-04
+
+- NEW FEATURE: remind: Add the "INFO" clause to the REM command.  This
+  is intended for storing additional metadata about an event, such as
+  the location and a longer description.  The intention is to make
+  Remind <-> iCal conversions preserve as much information as possible.
+
+- NEW FEATURE: rem2html, rem2pdf, tkremind: Add support for the "Url:"
+  info string that turns reminders into hyper-links.  For example,
+  consider this reminder:
+
+      REM 15 INFO "Url: https://foo.example" MSG Foo
+
+  The text "Foo" will be made into a link to "https://foo.example"
+  by rem2html and rem2pdf.  If you middle-click it in tkremind, it
+  will open the URL.
+
+- NEW FEATURE: remind: Add the triginfo() built-in function so a reminder
+  body can refer to INFO data.  Add the %<...> substitution filter as a
+  shorthand for [triginfo("...")]
+
+- NEW FEATURE: TkRemind: Add "Location" and "Description" fields when
+  creating a reminder; these are converted to INFO clauses.  Also support
+  a popup window with the extra information when hovering over a reminder
+  in the calendar display.
+
+- IMPROVEMENT: Update the reminder files included with Remind to add
+  INFO strings with Wikipedia URLs for various holidays and
+  astronomical events.
+
+- IMPROVEMENT: remind: Add the "\xAB" escape sequence for parsing quoted
+  strings, where "AB" is a pair of hex digits.
+
+- NEW FUNCTION: remind: Add the escape() built-in function that converts
+  problematic characters within a string to the \-escaped versions.
+  It's essentially the inverse of how Remind parses a quoted string.
+
+* VERSION 5.2 Patch 3 - 2025-01-22
+
+- NEW FEATURE: remind: Add "TRANSLATE GENERATE" command for generating
+  a skeleton set of TRANSLATE commands to make it easier to localize
+  Remind.
+
+- NEW FEATURE: remind: Add "q" debug flag for tracing calls to _()
+  or %(...) in the substitution filter; this will help with localizing
+  reminder files.
+
+- NEW FILES: remind: Add holidays/lgbtq.rem for LGBTQ holidays.  Add
+  country-specific files in holidays/lgbtq/*.rem
+
+- IMPROVEMENT: TkRemind: use "info patchlevel" to display full Tcl/Tk
+  version.
+
+- IMPROVEMENT: remind: The DEBUG command issues a warning if given an
+  unknown debug flag.
+
+- BUG FIX: remind: "make test" will now succeed even if run between
+  23:55 and 00:00 UTC.  This is done with a new --test flag for remind.
+
+- BUG FIX: remind: Avoid potential buffer overflow if someone supplies
+  ridiculously-long translations for "am" or "pm".
+
+* VERSION 5.2 Patch 2 - 2025-01-06
+
+- NEW FEATURE: remind: The "-p+" option lets you produce weekly calendars;
+  so far, the rem2pdf and rem2html back-ends support rendering of weekly
+  calendars.
+
+- NEW FEATURE: remind: The $CalType system variable indicates the type of
+  calendar being produced; its value is one of "monthly", "weekly",
+  or "none".  "none" signifies agenda mode rather than calendar mode.
+
+- IMPROVEMENT: remind: Warn if a POP-OMIT-CONTEXT matches a
+  PUSH-OMIT-CONTEXT that is in a different file.
+
+- CHANGE: remind: Split the "-ds" debug option into two separate options:
+  "-ds" for debugging expression-parsing and "-dh" for printing hash
+  table statistics on exit.
+
+* VERSION 5.2 Patch 1 - 2024-12-16
+
+- BUG FIX: remind: Fix a logic error that only showed itself on big-endian
+  architectures.  Found thanks to Debian testing and a notification from
+  Jochen Sprickerhof.
+
+* VERSION 5.2 Patch 0 - 2024-12-16
+
+- MAJOR NEW FEATURE: remind: Add the TRANSLATE command, the _()
+  built-in function and the %(...) substitution sequence.  These allow
+  you to localize your reminder files more easily.  The translation table
+  is also made available to back-ends like rem2pdf and tkremind,
+  which they can use as they see fit.
+
+- MINOR FEATURE: tkremind, rem2html: Localize the names of the moon
+  phases.
+
+- MAJOR CHANGE: remind: Remind used to support compile-time localization
+  into different languages (French, English, etc.)  That compile-time
+  support has been removed and all localization is now done at run-time.
+
+- NEW FEATURE: remind: In JSON daemon mode (-zj), the front-end can
+  request translation table entries from the Remind daemon, allowing the
+  front-end to localize messages.
+
+- UPDATE: Update national holidays following update to upstream Python
+  library.
+
+- MINOR FEATURE: Add standard include/sun.rem file for sunrise/sunset.
+
+- MINOR FEATURE:  The SYSINCLUDE command has been added.  The command:
+
+      SYSINCLUDE foo/bar.rem
+
+  is equivalent to:
+
+      INCLUDE [$SysInclude]/foo/bar.rem
+
+- MINOR IMPROVEMENT: Allow INCLUDE, DO and SYSINCLUDE to include files with
+  spaces in their names; in this case, you have to put the filename inside
+  double-quotes.
+
+- IMPROVEMENT: remind: Refuse to open subdirectories named "*.rem"
+  under a top-level directory rather than trying and failing with a
+  confusing error.
+
+- IMPROVEMENT: contrib/remind-conf-mode: Fix a few bugs and choose colors
+  that are easier on the eyes.
+
+- IMPROVEMENT: remind: Remind used to have three completely separate
+  hash table implementations.  They have all been replaced with a single
+  implementation; this new implementation adapts the hash table size based
+  on the number of entries and is dramatically faster than the old code
+  when there are a large number of entries.
+
+- MINOR FIXES: remind: Fix typos in comments; use memcpy to copy OMIT
+  contexts internally.
+
+- BUG FIX: remind: Actually allow the documented 9 levels of INCLUDE
+  rather than 8.
+
+- BUG FIX: remind: If an INCLUDE statement failed inside an IF statement,
+  Remind would print spurious errors about unmatched IF/ENDIF.  This has
+  been fixed.
+
+* 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
@@ -1165,10 +1559,10 @@ CHANGES TO REMIND
 - NEW FEATURE: Add "-u+username" variant to tell Remind to switch users to
  "username" without disabling RUN directives.  Idea courtesy of Ian! D. Allen

- CHANGE: rem2html: rem2html has been moved out of the www/ directory into
-  its own rem2html/ directory.  If your system has the prerequisites
-  (namely Perl, Getopt::Long and JSON::Any) then rem2html will be installed
-  by "make install".
+- CHANGE: rem2html: rem2html has been moved out of the www/ directory
+  into its own rem2html/ directory.  If your system has the
+  prerequisites (namely Perl, Getopt::Long and JSON::MaybeXS) then
+  rem2html will be installed by "make install".

 - CHANGE: Remove "cm2rem".  It was about 20 years obsolete.

@@ -32,6 +32,64 @@ EOF

 remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
+FSET angle_to_direction(x) \
+IIF(x > 348 && x <= 11, "North", \
+    x > 11 && x <= 34, "North North-East", \
+    x > 34 && x <= 56, "North-East", \
+    x > 56 && x <= 79, "East North-East", \
+    x > 79 && x <= 101, "East", \
+    x > 101 && x <= 124, "East South-East", \
+    x > 124 && x <= 146, "South-East", \
+    x > 146 && x <= 169, "South South-East", \
+    x > 169 && x <= 191, "South", \
+    x > 191 && x <= 214, "South South-West", \
+    x > 214 && x <= 236, "South-West", \
+    x > 236 && x <= 259, "West South-West", \
+    x > 259 && x <= 281, "West", \
+    x > 281 && x <= 304, "West North-West", \
+    x > 304 && x <= 326, "North-West", \
+    "North North-West")
+
+BANNER %
+set mr moonrise()
+set ms moonset()
+set mr_a moonrisedir()
+set ms_a moonsetdir()
+
+REM NOQUEUE [mr] MSG Moonrise:              %*3 in the [angle_to_direction(mr_a)] ([mr_a] degrees)
+REM NOQUEUE [ms] MSG Moonset:               %*3 in the [angle_to_direction(ms_a)] ([ms_a] degrees)
+
+IF (datepart(mr) != today())
+    REM MSG Moonrise:              No moonrise today
+ENDIF
+IF (datepart(ms) != today())
+    REM MSG Moonset:               No moonset today
+ENDIF
+EOF
+
+echo ""
+
+
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+SET $AddBlankLines 0
+FSET angle_to_direction(x) \
+IIF(x > 348 || x <= 11, "North", \
+    x > 11 && x <= 34, "North North-East", \
+    x > 34 && x <= 56, "North-East", \
+    x > 56 && x <= 79, "East North-East", \
+    x > 79 && x <= 101, "East", \
+    x > 101 && x <= 124, "East South-East", \
+    x > 124 && x <= 146, "South-East", \
+    x > 146 && x <= 169, "South South-East", \
+    x > 169 && x <= 191, "South", \
+    x > 191 && x <= 214, "South South-West", \
+    x > 214 && x <= 236, "South-West", \
+    x > 236 && x <= 259, "West South-West", \
+    x > 259 && x <= 281, "West", \
+    x > 281 && x <= 304, "West North-West", \
+    x > 304 && x <= 326, "North-West", \
+    "North North-West")
+
 BANNER %
 IF $TerminalBackground == 0
   REM [moondatetime(0)] +60 SPECIAL COLOR 255 255 0 New moon:              🌑 [$T] %3 (%b)
@@ -21,7 +21,7 @@
 #  "#PSSTUFF" for nifty PostScript examples				    #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-2024 Dianne Skoll                                      #
+# Copyright (C) 1992-2025 Dianne Skoll                                      #
 # SPDX-License-Identifier: GPL-2.0-only
 # 									    #
 #############################################################################
@@ -2,7 +2,7 @@
 # Not all sequences are supported by all terminals.

 # This file is part of REMIND
-# REMIND is Copyright (C) 1992-2024 by Dianne Skoll
+# REMIND is Copyright (C) 1992-2025 by Dianne Skoll
 # SPDX-License-Identifier: GPL-2.0-only

 if !defined("ansi_bold")
@@ -28,7 +28,7 @@ if !defined("ansi_bold")
        set ansi_underline2 char(27) + "[21m"
        set ansi_overline   char(27) + "[53m"
    endif
-    preserve ansi_normal ansi_bold ansi_faint ansi_italic ansi_underline2 ansi_reverse ansi_strikeout ansi_underline2 ansi_overline
+    preserve ansi_normal ansi_bold ansi_faint ansi_italic ansi_underline ansi_reverse ansi_strikeout ansi_underline2 ansi_overline
 endif

 # Example: REM MSG I must [ansi_bold]emphasize[ansi_normal] \
@@ -0,0 +1,65 @@
+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
+    PUSH-FUNCS msgsuffix
+
+    # Save old value of $DefaultDelta
+    PUSH-VARS $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...
+    SYSINCLUDE holidays/us.rem
+    SYSINCLUDE holidays/us/ny.rem
+
+    # Restore old value $DefaultDelta
+    POP-VARS
+
+    # Restore old version of msgsuffix
+    POP-FUNCS
+
@@ -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
@@ -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 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
@@ -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 SYSINCLUDE holidays/ad.rem

 OMIT 15 August MSG Encamp Annual Festival
 OMIT 16 August MSG Encamp Annual Festival
@@ -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 SYSINCLUDE holidays/ad.rem

 OMIT 15 August MSG La Massana Annual Festival
 OMIT 16 August MSG La Massana Annual Festival
@@ -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 SYSINCLUDE holidays/ad.rem

 OMIT 15 August MSG Ordino Annual Festival
 OMIT 16 August MSG Ordino Annual Festival
@@ -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 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
@@ -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 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
@@ -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 SYSINCLUDE holidays/ad.rem

 OMIT 25 July MSG Escaldes-Engordany Annual Festival
 OMIT 26 July MSG Escaldes-Engordany Annual Festival
@@ -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 اليوم الوطني
@@ -2,30 +2,32 @@
 # 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ë)
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 6)] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)
 OMIT 2 January MSG Festat e Vitit të Ri
-REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2))==0 || wkdaynum(date($Ty, 1, 2))==6] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)
+REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 2)), 0, 6)] MSG Festat e Vitit të Ri (ditë pushimi e shtyrë)
 OMIT 14 March MSG Dita e Verës
-REM 14 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 14))==0 || wkdaynum(date($Ty, 3, 14))==6] MSG Dita e Verës (ditë pushimi e shtyrë)
+REM 14 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 14)), 0, 6)] MSG Dita e Verës (ditë pushimi e shtyrë)
 OMIT 22 March MSG Dita e Nevruzit
-REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22))==0 || wkdaynum(date($Ty, 3, 22))==6] MSG Dita e Nevruzit (ditë pushimi e shtyrë)
-REM 31 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 31))==0 || wkdaynum(date($Ty, 3, 31))==6] MSG E diela e Pashkëve Katolike (ditë pushimi e shtyrë)
+REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 22)), 0, 6)] MSG Dita e Nevruzit (ditë pushimi e shtyrë)
+REM 31 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 31)), 0, 6)] MSG E diela e Pashkëve Katolike (ditë pushimi e shtyrë)
 OMIT [easterdate($Uy)] MSG E diela e Pashkëve Katolike
 OMIT [easterdate($Uy)] MSG E diela e Pashkëve Ortodokse
 OMIT 1 May MSG Dita Ndërkombëtare e Punëtorëve
-REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Dita Ndërkombëtare e Punëtorëve (ditë pushimi e shtyrë)
-REM 5 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5))==0 || wkdaynum(date($Ty, 5, 5))==6] MSG E diela e Pashkëve Ortodokse (ditë pushimi e shtyrë)
+REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 1)), 0, 6)] MSG Dita Ndërkombëtare e Punëtorëve (ditë pushimi e shtyrë)
+REM 5 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 5)), 0, 6)] MSG E diela e Pashkëve Ortodokse (ditë pushimi e shtyrë)
 OMIT 5 September MSG Dita e Shenjtërimit të Shenjt Terezës
-REM 5 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 5))==0 || wkdaynum(date($Ty, 9, 5))==6] MSG Dita e Shenjtërimit të Shenjt Terezës (ditë pushimi e shtyrë)
+REM 5 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 5)), 0, 6)] MSG Dita e Shenjtërimit të Shenjt Terezës (ditë pushimi e shtyrë)
 OMIT 22 November MSG Dita e Alfabetit
-REM 22 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 22))==0 || wkdaynum(date($Ty, 11, 22))==6] MSG Dita e Alfabetit (ditë pushimi e shtyrë)
+REM 22 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 22)), 0, 6)] MSG Dita e Alfabetit (ditë pushimi e shtyrë)
 OMIT 28 November MSG Dita Flamurit dhe e Pavarësisë
-REM 28 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28))==0 || wkdaynum(date($Ty, 11, 28))==6] MSG Dita Flamurit dhe e Pavarësisë (ditë pushimi e shtyrë)
+REM 28 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 28)), 0, 6)] MSG Dita Flamurit dhe e Pavarësisë (ditë pushimi e shtyrë)
 OMIT 29 November MSG Dita e Çlirimit
-REM 29 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 29))==0 || wkdaynum(date($Ty, 11, 29))==6] MSG Dita e Çlirimit (ditë pushimi e shtyrë)
+REM 29 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 29)), 0, 6)] MSG Dita e Çlirimit (ditë pushimi e shtyrë)
 OMIT 8 December MSG Dita Kombëtare e Rinisë
-REM 8 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8))==0 || wkdaynum(date($Ty, 12, 8))==6] MSG Dita Kombëtare e Rinisë (ditë pushimi e shtyrë)
+REM 8 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 8)), 0, 6)] MSG Dita Kombëtare e Rinisë (ditë pushimi e shtyrë)
 OMIT 25 December MSG Krishtlindjet
-REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Krishtlindjet (ditë pushimi e shtyrë)
+REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 25)), 0, 6)] MSG Krishtlindjet (ditë pushimi e shtyrë)
@@ -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 Նոր տարվա օր
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 11 November MSG Hl. Martin
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 19 March MSG Hl. Josef
 REM 10 October MSG Tag der Volksabstimmung
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 15 November MSG Hl. Leopold
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 4 May MSG Hl. Florian
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 24 September MSG Hl. Rupert
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 19 March MSG Hl. Josef
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 19 March MSG Hl. Josef
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 19 March MSG Hl. Josef
@@ -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 SYSINCLUDE holidays/at.rem

+
+# Optional holidays
 REM 15 November MSG Hl. Leopold
@@ -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
@@ -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 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
@@ -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 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
@@ -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 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)
@@ -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 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)
@@ -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 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)
@@ -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 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)
@@ -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 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)
@@ -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 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)
@@ -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
@@ -2,38 +2,42 @@
 # 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)
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 6)] MSG Yeni il bayramı (müşahidə olunur)
 OMIT 2 January MSG Yeni il bayramı
-REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2))==0 || wkdaynum(date($Ty, 1, 2))==6] MSG Yeni il bayramı (müşahidə olunur)
+REM 2 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 2)), 0, 6)] MSG Yeni il bayramı (müşahidə olunur)
 OMIT 20 January MSG Ümumxalq hüzn günü
 OMIT 8 March MSG Qadınlar günü
-REM 8 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8))==0 || wkdaynum(date($Ty, 3, 8))==6] MSG Qadınlar günü (müşahidə olunur)
+REM 8 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 8)), 0, 6)] MSG Qadınlar günü (müşahidə olunur)
 OMIT 20 March MSG Novruz bayramı
-REM 20 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 20))==0 || wkdaynum(date($Ty, 3, 20))==6] MSG Novruz bayramı (müşahidə olunur)
+REM 20 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 20)), 0, 6)] MSG Novruz bayramı (müşahidə olunur)
 OMIT 21 March MSG Novruz bayramı
-REM 21 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 21))==0 || wkdaynum(date($Ty, 3, 21))==6] MSG Novruz bayramı (müşahidə olunur)
+REM 21 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 21)), 0, 6)] MSG Novruz bayramı (müşahidə olunur)
 OMIT 22 March MSG Novruz bayramı
-REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22))==0 || wkdaynum(date($Ty, 3, 22))==6] MSG Novruz bayramı (müşahidə olunur)
+REM 22 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 22)), 0, 6)] MSG Novruz bayramı (müşahidə olunur)
 OMIT 23 March MSG Novruz bayramı
-REM 23 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23))==0 || wkdaynum(date($Ty, 3, 23))==6] MSG Novruz bayramı (müşahidə olunur)
+REM 23 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 23)), 0, 6)] MSG Novruz bayramı (müşahidə olunur)
 OMIT 24 March MSG Novruz bayramı
-REM 24 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24))==0 || wkdaynum(date($Ty, 3, 24))==6] MSG Novruz bayramı (müşahidə olunur)
+REM 24 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 24)), 0, 6)] MSG Novruz bayramı (müşahidə olunur)
 OMIT 9 May MSG Faşizm üzərində qələbə günü
-REM 9 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9))==0 || wkdaynum(date($Ty, 5, 9))==6] MSG Faşizm üzərində qələbə günü (müşahidə olunur)
+REM 9 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 9)), 0, 6)] MSG Faşizm üzərində qələbə günü (müşahidə olunur)
 OMIT 28 May MSG Müstəqillik Günü
-REM 28 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 28))==0 || wkdaynum(date($Ty, 5, 28))==6] MSG Müstəqillik Günü (müşahidə olunur)
+REM 28 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 28)), 0, 6)] MSG Müstəqillik Günü (müşahidə olunur)
 OMIT 15 June MSG Azərbaycan xalqının milli qurtuluş günü
-REM 15 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 15))==0 || wkdaynum(date($Ty, 6, 15))==6] MSG Azərbaycan xalqının milli qurtuluş günü (müşahidə olunur)
+REM 15 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 6, 15)), 0, 6)] MSG Azərbaycan xalqının milli qurtuluş günü (müşahidə olunur)
 OMIT 26 June MSG Azərbaycan Respublikasının Silahlı Qüvvələri günü
-REM 26 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 26))==0 || wkdaynum(date($Ty, 6, 26))==6] MSG Azərbaycan Respublikasının Silahlı Qüvvələri günü (müşahidə olunur)
+REM 26 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 6, 26)), 0, 6)] MSG Azərbaycan Respublikasının Silahlı Qüvvələri günü (müşahidə olunur)
 OMIT 8 November MSG Zəfər Günü
-REM 8 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 8))==0 || wkdaynum(date($Ty, 11, 8))==6] MSG Zəfər Günü (müşahidə olunur)
+REM 8 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 8)), 0, 6)] MSG Zəfər Günü (müşahidə olunur)
 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)
+REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 11, 9)), 0, 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)
+REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 31)), 0, 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ü
@@ -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)
@@ -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 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)
@@ -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 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)
@@ -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 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)
@@ -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)
@@ -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
@@ -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
@@ -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)
@@ -2,29 +2,33 @@
 # 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 Нова година (почивен ден)
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 1, 1)), 0, 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 Великден
+REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 3, 3)), 0, 6)] 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 Ден на труда и на международната работническа солидарност (почивен ден)
+REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 1)), 0, 6)] MSG Ден на труда и на международната работническа солидарност (почивен ден)
 OMIT 6 May MSG Гергьовден, Ден на храбростта и Българската армия
-REM 6 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 6))==0 || wkdaynum(date($Ty, 5, 6))==6] MSG Гергьовден, Ден на храбростта и Българската армия (почивен ден)
+REM 6 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 6)), 0, 6)] MSG Гергьовден, Ден на храбростта и Българската армия (почивен ден)
 OMIT 24 May MSG Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност
-REM 24 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24))==0 || wkdaynum(date($Ty, 5, 24))==6] MSG Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност (почивен ден)
+REM 24 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 5, 24)), 0, 6)] MSG Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност (почивен ден)
 OMIT 6 September MSG Ден на Съединението
-REM 6 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 6))==0 || wkdaynum(date($Ty, 9, 6))==6] MSG Ден на Съединението (почивен ден)
+REM 6 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 6)), 0, 6)] MSG Ден на Съединението (почивен ден)
 OMIT 22 September MSG Ден на Независимостта на България
-REM 22 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 22))==0 || wkdaynum(date($Ty, 9, 22))==6] MSG Ден на Независимостта на България (почивен ден)
+REM 22 September OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 9, 22)), 0, 6)] MSG Ден на Независимостта на България (почивен ден)
 OMIT 24 December MSG Бъдни вечер
-REM 24 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24))==0 || wkdaynum(date($Ty, 12, 24))==6] MSG Бъдни вечер (почивен ден)
+REM 24 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 24)), 0, 6)] MSG Бъдни вечер (почивен ден)
 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 Рождество Христово (почивен ден)
+REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 25)), 0, 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 Рождество Христово (почивен ден)
+REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [isany(wkdaynum(date($Ty, 12, 26)), 0, 6)] MSG Рождество Христово (почивен ден)
+
+# Optional holidays
 REM 1 November MSG Ден на народните будители
@@ -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 عيد العمال
@@ -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)
@@ -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)
@@ -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)
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 18 November MSG Día del departamento de Beni
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 14 September MSG Día del departamento de Cochabamba
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 25 May MSG Día del departamento de Chuquisaca
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 16 July MSG Día del departamento de La Paz
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 11 October MSG Día del departamento de Pando
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 10 November MSG Día del departamento de Potosí
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 24 September MSG Día del departamento de Santa Cruz
@@ -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 SYSINCLUDE holidays/bo.rem

 OMIT 15 April MSG La Tablada
@@ -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
@@ -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 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
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 24 June MSG São João
 OMIT 29 June MSG São Pedro
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 5 September MSG Elevação do Amazonas à categoria de província
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 19 March MSG São José
 OMIT 25 July MSG São Tiago
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 2 July MSG Independência da Bahia
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 19 March MSG São José
 OMIT 25 March MSG Abolição da escravidão no Ceará
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 21 April MSG Fundação de Brasília
 OMIT 30 November MSG Dia do Evangélico
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT [easterdate($Uy)+8] MSG Nossa Senhora da Penha
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 26 July MSG Fundação da cidade de Goiás
 OMIT 24 October MSG Pedra fundamental de Goiânia
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 28 July MSG Adesão do Maranhão à independência do Brasil
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 21 April MSG Execução de Tiradentes
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 11 October MSG Criação do Estado
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 15 August MSG Adesão do Grão-Pará à independência do Brasil
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 5 August MSG Fundação do Estado
@@ -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 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
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 19 October MSG Dia do Piauí
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 19 December MSG Emancipação do Paraná
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 23 April MSG São Jorge
@@ -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 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
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 4 January MSG Criação do Estado
 OMIT 18 June MSG Dia do Evangélico
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 5 October MSG Criação do Estado
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 20 September MSG Dia do Gaúcho
@@ -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 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
@@ -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 SYSINCLUDE holidays/br.rem

 OMIT 8 July MSG Emancipação política de Sergipe
--- a/Show More
+++ b/Show More