Fix cppcheck warning.

Otherwise, it's non-constant.

Makefile

@@ -43,8 +43,9 @@ test:
 	@$(MAKE) -C src -s test
 
 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

README.md

@@ -37,7 +37,7 @@ TkRemind requires Tcl/Tk and the tcllib library.
 
 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.
+all of your distribution's Noto Font-related packages.
 
 - On Debian-like systems, install with:
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for remind 05.03.05.
+# Generated by GNU Autoconf 2.71 for remind 05.04.00.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='05.03.05'
-PACKAGE_STRING='remind 05.03.05'
+PACKAGE_VERSION='05.04.00'
+PACKAGE_STRING='remind 05.04.00'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
 
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures remind 05.03.05 to adapt to many kinds of systems.
+\`configure' configures remind 05.04.00 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1327,7 +1327,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 05.03.05:";;
+     short | recursive ) echo "Configuration of remind 05.04.00:";;
    esac
   cat <<\_ACEOF
 
@@ -1415,7 +1415,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-remind configure 05.03.05
+remind configure 05.04.00
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1865,7 +1865,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by remind $as_me 05.03.05, which was
+It was created by remind $as_me 05.04.00, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4710,7 +4710,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by remind $as_me 05.03.05, which was
+This file was extended by remind $as_me 05.04.00, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4775,7 +4775,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-remind config.status 05.03.05
+remind config.status 05.04.00
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

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

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

@@ -145,8 +145,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")
@@ -164,23 +164,25 @@
 (defconst remind-builtin-functions
   (sort
    (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
-         "baseyr" "char" "choose" "coerce" "columns" "current" "date"
+         "baseyr" "catch" "catcherr" "char" "choose" "coerce" "columns" "const" "current" "date"
          "datepart" "datetime" "dawn" "day" "daysinmon" "defined" "dosubst"
-         "dusk" "easterdate" "escape" "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" "triginfo" "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

docs/WHATSNEW

@@ -1,6 +1,117 @@
 CHANGES TO REMIND
 
-* VERSION 5.3 Patch 5 - 2025-03-??
+* 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
@@ -12,11 +123,14 @@ CHANGES TO REMIND
 
 - 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.
+  on a reminder from the "Queue..." listing.
 
 * VERSION 5.3 Patch 4 - 2025-03-09
 
@@ -39,7 +153,7 @@ CHANGES TO REMIND
 - MINOR IMPROVEMENT: include/holidays/misc.rem: Add a few new holidays and
   URL INFO strings.
 
-- CHANGE: remind: Issue a warning if a time-related subsitution sequence
+- 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.

examples/astro

@@ -30,6 +30,46 @@ ELSE
 ENDIF
 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) \
@@ -66,50 +106,6 @@ 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 %
-set mr moonrise()
-set ms moonset()
-set mr_a moonrisedir()
-set ms_a moonsetdir()
-
-IF mr < ms
-    REM NOQUEUE [mr] MSG The moon rises %3 in the [angle_to_direction(mr_a)] ([mr_a] degrees)
-    REM NOQUEUE [ms] MSG The moon sets  %3 in the [angle_to_direction(ms_a)] ([ms_a] degrees)
-ELSE
-    REM NOQUEUE [ms] MSG The moon sets  %3 in the [angle_to_direction(ms_a)] ([ms_a] degrees)
-    REM NOQUEUE [mr] MSG The moon rises %3 in the [angle_to_direction(mr_a)] ([mr_a] degrees)
-ENDIF
-
-IF (datepart(mr) != today())
-    REM MSG There is no moonrise today
-ENDIF
-IF (datepart(ms) != today())
-    REM MSG There is no moonset today
-ENDIF
-EOF
-
-echo ""
-
 remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %

include/ansitext.rem

@@ -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] \

include/holidays/ad/02.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 REM Third Saturday in July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Sunday 16 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival

include/holidays/ad/03.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 OMIT 15 August MSG Encamp Annual Festival
 OMIT 16 August MSG Encamp Annual Festival

include/holidays/ad/04.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 OMIT 15 August MSG La Massana Annual Festival
 OMIT 16 August MSG La Massana Annual Festival

include/holidays/ad/05.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 OMIT 15 August MSG Ordino Annual Festival
 OMIT 16 August MSG Ordino Annual Festival

include/holidays/ad/06.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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

include/holidays/ad/07.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 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

include/holidays/ad/08.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ad.rem
+# also SYSINCLUDE holidays/ad.rem
 
 OMIT 25 July MSG Escaldes-Engordany Annual Festival
 OMIT 26 July MSG Escaldes-Engordany Annual Festival

include/holidays/al.rem

@@ -6,28 +6,28 @@
 # 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ë)

include/holidays/at/1.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/2.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/3.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/4.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/5.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/6.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/7.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/8.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/at/9.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/at.rem
+# also SYSINCLUDE holidays/at.rem
 
 
 # Optional holidays

include/holidays/au/act.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/nsw.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/nt.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/qld.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/sa.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/tas.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM Second Monday in March ADDOMIT SCANFROM -28 MSG Eight Hours Day
 REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday

include/holidays/au/vic.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/au/wa.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/au.rem
+# also SYSINCLUDE holidays/au.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)

include/holidays/az.rem

@@ -6,36 +6,36 @@
 # 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ü

include/holidays/ba/bih.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem
 
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
 OMIT 6 January MSG Badnji dan (Pravoslavni)

include/holidays/ba/brc.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem
 
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)

include/holidays/ba/srp.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ba.rem
+# also SYSINCLUDE holidays/ba.rem
 
 REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
 OMIT 6 January MSG Badnji dan (Pravoslavni)

include/holidays/bg.rem

@@ -6,29 +6,29 @@
 # 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 Ден на Освобождението на България от османско иго (почивен ден)
+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 Ден на народните будители

include/holidays/bo/b.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 18 November MSG Día del departamento de Beni

include/holidays/bo/c.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 14 September MSG Día del departamento de Cochabamba

include/holidays/bo/h.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 25 May MSG Día del departamento de Chuquisaca

include/holidays/bo/l.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 16 July MSG Día del departamento de La Paz

include/holidays/bo/n.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 11 October MSG Día del departamento de Pando

include/holidays/bo/o.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro

include/holidays/bo/p.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 10 November MSG Día del departamento de Potosí

include/holidays/bo/s.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 24 September MSG Día del departamento de Santa Cruz

include/holidays/bo/t.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/bo.rem
+# also SYSINCLUDE holidays/bo.rem
 
 OMIT 15 April MSG La Tablada

include/holidays/br/ac.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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

include/holidays/br/al.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 24 June MSG São João
 OMIT 29 June MSG São Pedro

include/holidays/br/am.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 5 September MSG Elevação do Amazonas à categoria de província

include/holidays/br/ap.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 19 March MSG São José
 OMIT 25 July MSG São Tiago

include/holidays/br/ba.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 2 July MSG Independência da Bahia

include/holidays/br/ce.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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á

include/holidays/br/df.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 21 April MSG Fundação de Brasília
 OMIT 30 November MSG Dia do Evangélico

include/holidays/br/es.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT [easterdate($Uy)+8] MSG Nossa Senhora da Penha

include/holidays/br/go.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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

include/holidays/br/ma.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 28 July MSG Adesão do Maranhão à independência do Brasil

include/holidays/br/mg.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 21 April MSG Execução de Tiradentes

include/holidays/br/ms.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 11 October MSG Criação do Estado

include/holidays/br/pa.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 15 August MSG Adesão do Grão-Pará à independência do Brasil

include/holidays/br/pb.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 5 August MSG Fundação do Estado

include/holidays/br/pe.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 REM First Sunday in March ADDOMIT SCANFROM -28 MSG Revolução Pernambucana

include/holidays/br/pi.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 19 October MSG Dia do Piauí

include/holidays/br/pr.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 19 December MSG Emancipação do Paraná

include/holidays/br/rj.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 23 April MSG São Jorge

include/holidays/br/rn.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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

include/holidays/br/ro.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 4 January MSG Criação do Estado
 OMIT 18 June MSG Dia do Evangélico

include/holidays/br/rr.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 5 October MSG Criação do Estado

include/holidays/br/rs.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 20 September MSG Dia do Gaúcho

include/holidays/br/sc.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/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

include/holidays/br/se.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 8 July MSG Emancipação política de Sergipe

include/holidays/br/sp.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 9 July MSG Revolução Constitucionalista

include/holidays/br/to.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/br.rem
+# also SYSINCLUDE holidays/br.rem
 
 OMIT 18 March MSG Dia da Autonomia
 OMIT 8 September MSG Nossa Senhora da Natividade

include/holidays/ca/ab.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 

include/holidays/ca/bc.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 REM First Monday in August ADDOMIT SCANFROM -28 MSG British Columbia Day

include/holidays/ca/mb.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Louis Riel Day
 

include/holidays/ca/nb.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 REM First Monday in August ADDOMIT SCANFROM -28 MSG New Brunswick Day

include/holidays/ca/nl.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 OMIT 1 July MSG Memorial Day
 

include/holidays/ca/ns.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Heritage Day
 

include/holidays/ca/nt.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday

include/holidays/ca/nu.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday
 

include/holidays/ca/on.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 

include/holidays/ca/pe.rem

@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Islander Day

include/holidays/ca/qc.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG National Patriots' Day
 OMIT 24 June MSG Saint Jean Baptiste Day

include/holidays/ca/sk.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 REM First Monday in August ADDOMIT SCANFROM -28 MSG Saskatchewan Day

include/holidays/ca/yt.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ca.rem
+# also SYSINCLUDE holidays/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
 REM Third Monday in August ADDOMIT SCANFROM -28 MSG Discovery Day

include/holidays/ch/ag.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT 2 January MSG Berchtoldstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag

include/holidays/ch/ai.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag

include/holidays/ch/ar.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag

include/holidays/ch/be.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT 2 January MSG Berchtoldstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag

include/holidays/ch/bl.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag

include/holidays/ch/bs.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag

include/holidays/ch/fr.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 

include/holidays/ch/ge.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag

include/holidays/ch/gl.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 REM Thursday 1 April ADDOMIT SCANFROM -28 SATISFY [$T != easterdate($Ty)-3] MSG Näfelser Fahrt
 REM Thursday 8 April ADDOMIT SCANFROM -28 SATISFY [$T == easterdate($Ty)+4] MSG Näfelser Fahrt

include/holidays/ch/gr.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag

include/holidays/ch/ju.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT 2 January MSG Berchtoldstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag

include/holidays/ch/lu.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT 2 January MSG Berchtoldstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag

include/holidays/ch/ne.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Berchtoldstag
 OMIT 1 March MSG Jahrestag der Ausrufung der Republik

include/holidays/ch/nw.rem

@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/holidays/ch.rem
+# also SYSINCLUDE holidays/ch.rem
 
 OMIT 19 March MSG Josefstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag