Bump to version 05.03.06.

Add a note about $SuppressLRM right under the "-c" option documentation.
Make "remind -s" respect $DefaultColor
2026-04-16 14:28:40 +02:00 · 2025-04-25 11:02:22 -04:00 · 2025-04-24 16:11:32 -04:00 · 2025-04-23 10:15:20 -04:00 · 2025-03-25 15:22:49 -04:00 · 2025-03-24 11:42:54 -04:00
722 changed files with 985982 additions and 18324 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 .gitignore		export-ignore
 .gitattributes		export-ignore
 remind.php		export-ignore
-sync-to-dianne-git	export-ignore
+sync-to-dianne-git	export-ignore
+php                     export-ignore
--- a/.gitignore
+++ b/.gitignore
@@ -2,16 +2,36 @@
 *.o
 *~
 .gitignore
+MYMETA.json
+MYMETA.yml
+Makefile
 TAGS
 autom4te.cache
+blib/
 config.log
 config.status
+man/rem.1
+man/rem2ps.1
+man/remind.1
+man/tkremind.1
+pm_to_blib
 rem2html/Makefile
+rem2html/rem2html
+rem2html/rem2html.1
+rem2pdf/Makefile.PL
+rem2pdf/Makefile.old
+rem2pdf/Makefile.top
+rem2pdf/bin/rem2pdf
+scripts/tkremind
 src/*.tar.gz*
 src/Makefile
 src/config.h
 src/rem2ps
 src/remind
+src/test-*.out
 src/version.h
 tests/test.out
 www/Makefile
+gmon.out
+tests/once.timestamp
+src/xlat.c
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+workflow:
+  rules:
+    - if: $CI_COMMIT_BRANCH =~ /wip/
+      when: never
+
+tests:
+  image: 'debian:stable-slim'
+  before_script:
+    - apt update && apt-get -y install gcc make
+    - useradd --create-home testuser
+    - chown -R testuser .
+    - chmod -R go-w .
+  script:
+    - LANG=C.UTF-8 su testuser -c './configure && make all && make test'
+  artifacts:
+    when: always
+    paths:
+      - tests/test.out
--- a/4
+++ b/4
@@ -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-2021 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
@@ -16,7 +16,7 @@ individual files.
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

--- a/30
+++ b/30
@@ -1,30 +0,0 @@
-MICROSOFT WINDOWS
-=================
-
-I used to prohibit porting Remind to Microsoft Windows.  However, this
-may cause problems with the GPL, so I have removed that restriction.
-
-Although I cannot prevent you from porting Remind to Windows, I appeal
-to you not to do it.  I am trying to encourage the growth of free
-software, not proprietary software.
-
-If you port Remind to Windows, I will not provide support or answers to
-questions -- you're on your own.  On the other hand, I will feel no guilt
-in taking enhancements and merging them into the UNIX stream.
-
-APPLE
-=====
-
-I can't prevent you from using Remind on Apple's products, but I hope
-you don't.  Apple's corporate culture is the very antithesis of Free
-Software.  Rather than using Mac OS X, I encourage you to switch to
-Linux or FreeBSD, two Free Software operating systems that are every
-bit as capable as Mac OS X and which are unencumbered by Apple's
-arbitrary restrictions.
-
-And if you're looking to port Remind to other Apple products like the
-iPhone or iPad, please don't.  Those products enforce Apple's rigorous
-controls much more stringently than Mac OS X on an Apple PC.
-
--
-Dianne Skoll
--- a/38
+++ b/38
@@ -1,4 +1,5 @@
 # Top-level Makefile for Remind.
+# SPDX-License-Identifier: GPL-2.0-only

 all: src/Makefile
 	@echo ""
@@ -9,27 +10,42 @@ all: src/Makefile
 	@echo "*******************"
 	@echo ""
 	@cd src && $(MAKE) all LANGDEF=$(LANGDEF)
-
+	@$(MAKE) -C rem2pdf -f Makefile.top
 install:
 	@echo ""
-	@echo "*********************"
-	@echo "*                   *"
-	@echo "* Installing REMIND *"
-	@echo "*                   *"
-	@echo "*********************"
+	@echo "**********************************"
+	@echo "*                                *"
+	@echo "* Installing REMIND (unstripped) *"
+	@echo "*                                *"
+	@echo "**********************************"
 	@echo ""
 	@$(MAKE) -C src install
 	@$(MAKE) -C rem2html install
-
+	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)
 clean:
-	find . -name '*~' -exec rm {} \;
-	cd src && $(MAKE) clean
+	-find . -name '*~' -exec rm {} \;
+	-$(MAKE) -C src clean
+	-$(MAKE) -C rem2pdf clean
+
+install-stripped:
+	@echo ""
+	@echo "********************************"
+	@echo "*                              *"
+	@echo "* Installing REMIND (stripped) *"
+	@echo "*                              *"
+	@echo "**********************************"
+	@echo ""
+	@$(MAKE) -C src install-stripped
+	@$(MAKE) -C rem2html install
+	@$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE)

 test:
-	@cd src && $(MAKE) -s 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
+	-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
--- a/38
+++ b/38
@@ -1,38 +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.
-
-Contact info: mailto:dianne@skoll.ca
-Home page:    https://dianne.skoll.ca/projects/remind/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,63 @@
+# 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 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`
+
+## 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`
+
+---
+
+Contact info: dianne@skoll.ca
+
+Home page:    [https://dianne.skoll.ca/projects/remind/](https://dianne.skoll.ca/projects/remind/)
+
--- a/build.tk
+++ b/build.tk
@@ -1,5 +1,6 @@
 #!/bin/sh
 # -*-Mode: TCL;-*-
+# SPDX-License-Identifier: GPL-2.0-only

 #--------------------------------------------------------------
 #   BUILD.TK
@@ -7,13 +8,15 @@
 #   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
 #
 #--------------------------------------------------------------

 # the next line restarts using wish \
 exec wish "$0" "$@"

+global RemindExecutable
+
 #***********************************************************************
 # %PROCEDURE: SetConfigDefaults
 # %ARGUMENTS:
@@ -26,22 +29,19 @@ exec wish "$0" "$@"
 proc SetConfigDefaults {} {
    global Config
    set Config(LAT_DEG) 45
-    set Config(LAT_MIN) 24
+    set Config(LAT_MIN) 25
+    set Config(LAT_SEC) 14
    set Config(LON_DEG) 75
-    set Config(LON_MIN) 39
+    set Config(LON_MIN) 41
+    set Config(LON_SEC) 23
    set Config(LOCATION) "Ottawa"
    set Config(DEFAULT_PAGE) "Letter"
    set Config(DATESEP) "-"
    set Config(TIMESEP) ":"
-    set Config(ISOLATIN1) 0
-    set Config(IBMEXTENDED) 0
-    set Config(ISOLATIN2) 0
-    set Config(IBM852) 0
    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/man"
+    set Config(MAN_DIR) "/usr/local/share/man"
 }

 #***********************************************************************
@@ -54,7 +54,7 @@ proc SetConfigDefaults {} {
 #  Pops up an error dialog; then calls exit.
 #***********************************************************************
 proc Bail { msg } {
-    tk_dialog .err "Remind Configuration Error" $msg error 0 "Bummer"
+    tk_messageBox -message "Remind Build Error" -detail $msg -icon error -type ok
    exit 1
 }

@@ -125,7 +125,7 @@ proc CreateMainDialog {} {
 #  Creates the "installation directories" dialog.
 #***********************************************************************
 proc CreateInstallDirDialog { w } {
-    global Config
+    global Config RemindExecutable
    label $w.binlabel -text "Location for programs: "
    entry $w.bin -width 30
    $w.bin insert end $Config(INST_DIR)
@@ -134,16 +134,19 @@ proc CreateInstallDirDialog { w } {
    entry $w.man -width 30
    $w.man insert end $Config(MAN_DIR)

-    text $w.blurb -width 1 -height 5 -wrap word -relief flat -takefocus 0
-    $w.blurb insert end "\n(Tabbed-notebook Tcl code taken from \"Effective Tcl/Tk Programming\" by Mark Harrison and Michael McLennan, Addison-Wesley Professional Computing Series.)"
-    $w.blurb configure -state disabled
-    # Disable all text-window behaviour
-    bindtags $w.blurb {NoSuchTag}
+    text $w.blurb -width 1 -height 20 -wrap word -relief flat -takefocus 0
+    if { "$RemindExecutable" != "" } {
+        $w.blurb insert end "Note: Default settings were obtained by querying the existing installed version of Remind found at: $RemindExecutable\n"
+    }
+    $w.blurb insert end "\n(Tabbed-notebook Tcl code taken from \"Effective Tcl/Tk Programming\" by Mark Harrison and Michael McLennan, Addison-Wesley Professional Computing Series.)\n"
    grid $w.binlabel -row 0 -column 0 -sticky e
    grid $w.bin -row 0 -column 1 -sticky nsew
    grid $w.manlabel -row 1 -column 0 -sticky e
    grid $w.man -row 1 -column 1 -sticky nsew
    grid $w.blurb - -sticky nsew
+    # Disable all text-window behaviour
+    bindtags $w.blurb {NoSuchTag}
+    $w.blurb configure -state disabled
 }

 #***********************************************************************
@@ -161,10 +164,14 @@ proc CreateLocationDialog { w } {
 	    -from 0 -to 89 -length 300 -variable Config(LAT_DEG)
    scale $w.latmin -label "Latitude (minutes)" -orient horizontal \
 	    -from 0 -to 59 -length 300 -variable Config(LAT_MIN)
+    scale $w.latsec -label "Latitude (seconds)" -orient horizontal \
+	    -from 0 -to 59 -length 300 -variable Config(LAT_SEC)
    scale $w.londeg -label "Longitude (degrees)" -orient horizontal \
 	    -from 0 -to 179 -length 300 -variable Config(LON_DEG)
    scale $w.lonmin -label "Longtude (minutes)" -orient horizontal \
 	    -from 0 -to 59 -length 300 -variable Config(LON_MIN)
+    scale $w.lonsec -label "Longitude (seconds)" -orient horizontal \
+	    -from 0 -to 59 -length 300 -variable Config(LON_SEC)

    radiobutton $w.north -text "Northern Hemisphere" \
 	    -variable Config(NORTHERN_HEMISPHERE) -value 1
@@ -180,13 +187,15 @@ proc CreateLocationDialog { w } {
    $w.location insert end $Config(LOCATION)
    grid $w.latdeg -
    grid $w.latmin -
+    grid $w.latsec -
    grid $w.londeg -
    grid $w.lonmin -
+    grid $w.lonsec -

    grid $w.north $w.west
    grid $w.south $w.east
-    grid $w.loclab -sticky e 
-    grid $w.location -sticky nsew -row 6 -column 1
+    grid $w.loclab -sticky e
+    grid $w.location -sticky nsew -row 8 -column 1
 }

 #***********************************************************************
@@ -232,45 +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.charlabel -text "Character set: "
-    menubutton $w.char -text "ISO 8859-1" -indicatoron 1 -relief raised \
-	    -menu $w.char.menu
-    menu $w.char.menu -tearoff 0
-    $w.char.menu add command -label "ISO 8859-1" -command "$w.char configure -text {ISO 8859-1}"
-    $w.char.menu add command -label "ISO 8859-2" -command "$w.char configure -text {ISO 8859-2}"
-    $w.char.menu add command -label "IBM Extended" -command "$w.char configure -text {IBM Extended}"
-    $w.char.menu add command -label "IBM CPI-852" -command "$w.char configure -text {ISO 8859-2}"
-    $w.char.menu add command -label "Plain ASCII" -command "$w.char configure -text {Plain ASCII}"
-
-    grid configure $w.charlabel -row 3 -column 0 -sticky e
-    grid configure $w.char -row 3 -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 4 -column 0 -sticky e
-    grid configure $w.lang -row 4 -column 1 -sticky nsew
-
 }

 #***********************************************************************
@@ -301,9 +271,9 @@ proc BuildRemind {} {

    .msgs insert end "\n>>> Creating src/custom.h...\n\n" green
    CreateCustomH
-    .msgs insert end ">>> Calling `./configure'...\n\n" green
+    .msgs insert end "\n>>> Calling `./configure'...\n\n" green
    CallConfigure
-    .msgs insert end ">>> Calling `make'...\n\n" green
+    .msgs insert end "\n>>> Calling `make'...\n\n" green
    CallMake
    .msgs insert end "\n----------------------------------------------\n\n"
    .msgs insert end "Remind" red
@@ -364,7 +334,7 @@ proc RunCommand { cmd } {
 # %RETURNS:
 #  Nothing
 # %DESCRIPTION:
-#  Reads characters from command pipelin and appends them to .msg.
+#  Reads characters from command pipeline and appends them to .msg.
 #***********************************************************************
 proc CommandReadable { f } {
    global CmdDone
@@ -423,15 +393,19 @@ proc CreateCustomH {} {
    # modify them willy-nilly
    set LAT_DEG $Config(LAT_DEG)
    set LAT_MIN $Config(LAT_MIN)
+    set LAT_SEC $Config(LAT_SEC)
    set LON_DEG $Config(LON_DEG)
    set LON_MIN $Config(LON_MIN)
+    set LON_SEC $Config(LON_SEC)
    if {!$Config(NORTHERN_HEMISPHERE)} {
 	set LAT_DEG "-$LAT_DEG"
 	set LAT_MIN "-$LAT_MIN"
+	set LAT_SEC "-$LAT_SEC"
    }
    if {!$Config(WESTERN_HEMISPHERE)} {
 	set LON_DEG "-$LON_DEG"
 	set LON_MIN "-$LON_MIN"
+	set LON_SEC "-$LON_SEC"
    }
    set Config(LOCATION) [$Loc.location get]

@@ -446,38 +420,17 @@ proc CreateCustomH {} {
    set Config(DATESEP) [$Options.date cget -text]
    set Config(TIMESEP) [$Options.time cget -text]

-    switch -- [$Options.char cget -text] {
-	"ISO 8859-1" {
-	    set Config(ISOLATIN1) 1
-	}
-	"ISO 8859-2" {
-	    set Config(ISOLATIN2) 1
-	}
-	"IBM CPI-852" {
-	    set Config(IBM852) 1
-	}
-	"IBM Extended" {
-	    set Config(IBMEXTENDED) 1
-	}
-    }
-
    while {[gets $in line] != -1} {
 	switch -glob -- $line {
-	    "#define LAT_DEG *" {
-		puts $out "#define LAT_DEG $LAT_DEG"
-		.msgs insert end "#define LAT_DEG $LAT_DEG\n"
+	    "#define DEFAULT_LATITUDE *" {
+                set lat [expr $LAT_DEG + ($LAT_MIN/60.0) + ($LAT_SEC/3600.0)];
+		puts $out "#define DEFAULT_LATITUDE $lat"
+		.msgs insert end "#define DEFAULT_LATITUDE $lat\n"
 	    }
-	    "#define LAT_MIN *" {
-		puts $out "#define LAT_MIN $LAT_MIN"
-		.msgs insert end "#define LAT_MIN $LAT_MIN\n"
-	    }
-	    "#define LON_DEG *" {
-		puts $out "#define LON_DEG $LON_DEG"
-		.msgs insert end "#define LON_DEG $LON_DEG\n"
-	    }
-	    "#define LON_MIN *" {
-		puts $out "#define LON_MIN $LON_MIN"
-		.msgs insert end "#define LON_MIN $LON_MIN\n"
+	    "#define DEFAULT_LONGITUDE *" {
+                set lon [expr -1.0 * ($LON_DEG + ($LON_MIN/60.0) + ($LON_SEC/3600.0))]
+		puts $out "#define DEFAULT_LONGITUDE $lon"
+		.msgs insert end "#define DEFAULT_LONGITUDE $lon\n"
 	    }
 	    "#define LOCATION *" {
 		puts $out "#define LOCATION \"$Config(LOCATION)\""
@@ -495,22 +448,6 @@ proc CreateCustomH {} {
 		puts $out "#define TIMESEP '$Config(TIMESEP)'"
 		.msgs insert end "#define TIMESEP '$Config(TIMESEP)'\n"
 	    }
-	    "#define ISOLATIN1 *" {
-		puts $out "#define ISOLATIN1 $Config(ISOLATIN1)"
-		.msgs insert end "#define ISOLATIN1 $Config(ISOLATIN1)\n"
-	    }
-	    "#define ISOLATIN2 *" {
-		puts $out "#define ISOLATIN2 $Config(ISOLATIN2)"
-		.msgs insert end "#define ISOLATIN2 $Config(ISOLATIN2)\n"
-	    }
-	    "#define IBM852 *" {
-		puts $out "#define IBM852 $Config(IBM852)"
-		.msgs insert end "#define IBM852 $Config(IBM852)\n"
-	    }
-	    "#define IBMEXTENDED *" {
-		puts $out "#define IBMEXTENDED $Config(IBMEXTENDED)"
-		.msgs insert end "#define IBMEXTENDED $Config(IBMEXTENDED)\n"
-	    }
 	    default {
 		puts $out $line
 	    }
@@ -527,27 +464,17 @@ 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"
+    } else {
+        RunCommand "make"
    }
-    RunCommand "make \"LANGDEF=-DLANG=$lang\""
 }


@@ -560,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
@@ -674,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
@@ -762,7 +689,7 @@ proc notebook_fix_size {win} {
 #***********************************************************************
 proc FindRemind {} {
    global env
-    set path [concat [split $env(PATH) ":"] "/bin" "/usr/bin" "/usr/local/bin"]
+    set path [concat [split $env(PATH) ":"] "/usr/local/bin" "/bin" "/usr/bin" ]
    foreach thing $path {
 	if [file executable [file join $thing "remind"]] {
 	    return [file join $thing "remind"]
@@ -780,16 +707,17 @@ proc FindRemind {} {
 #  sensible defaults.
 #***********************************************************************
 proc SetConfigFromRemind {} {
-    global Config
+    global Config RemindExecutable
    SetConfigDefaults
    set rem [FindRemind]
+    set RemindExecutable $rem
    if {"$rem" == ""} {
 	return
    }
    set dir [file dirname $rem]
    set Config(INST_DIR) $dir
    if {"$dir" == "/usr/local/bin"} {
-	set Config(MAN_DIR) "/usr/local/man"
+	set Config(MAN_DIR) "/usr/local/share/man"
    } elseif {$dir == "/usr/bin"} {
 	set Config(MAN_DIR) "/usr/share/man"
    }
@@ -799,6 +727,8 @@ proc SetConfigFromRemind {} {
 	set Config(MAN_DIR) "/usr/share/man"
    } elseif {[file readable "/usr/man/man1/remind.1"]} {
 	set Config(MAN_DIR) "/usr/man"
+    } elseif {[file readable "/usr/local/share/man/man1/remind.1"]} {
+	set Config(MAN_DIR) "/usr/local/share/man"
    } elseif {[file readable "/usr/local/man/man1/remind.1"]} {
 	set Config(MAN_DIR) "/usr/local/man"
    }
@@ -806,14 +736,16 @@ proc SetConfigFromRemind {} {
    # Query Remind for the rest
    QueryRemind $rem LAT_DEG {$LatDeg}
    QueryRemind $rem LAT_MIN {$LatMin}
+    QueryRemind $rem LAT_SEC {$LatSec}
    QueryRemind $rem LON_DEG {$LongDeg}
    QueryRemind $rem LON_MIN {$LongMin}
+    QueryRemind $rem LON_SEC {$LongSec}
    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))]
    if {$Config(LAT_DEG) >= 0} {
 	set Config(NORTHERN_HEMISPHERE) 1
    } else {
@@ -822,6 +754,7 @@ proc SetConfigFromRemind {} {
    }

    set $Config(LON_MIN) [expr abs($Config(LON_MIN))]
+    set $Config(LON_SEC) [expr abs($Config(LON_SEC))]
    if {$Config(LON_DEG) >= 0} {
 	set Config(WESTERN_HEMISPHERE) 1
    } else {
--- a/3240
+++ b/3240
--- a/configure.ac
+++ b/configure.ac
@@ -0,0 +1,101 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT(remind, 05.03.06, , , https://dianne.skoll.ca/projects/remind/)
+AC_CONFIG_SRCDIR([src/queue.c])
+
+cat <<'EOF'
+
+**********************
+*                    *
+* Configuring REMIND *
+*                    *
+**********************
+
+EOF
+
+AC_CONFIG_HEADERS([src/config.h])
+
+AC_ARG_ENABLE(perl-build-artifacts,
+[  --disable-perl-build-artifacts
+                          Disable perllocal.pod and .packlist generation], ac_cv_perlartifacts=$enableval, ac_cv_perlartifacts=yes)
+
+AH_BOTTOM([#include <custom.h>])
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PATH_PROG([PERL], [perl])
+
+dnl Checks for libraries.
+AC_CHECK_LIB(m, sqrt)
+AC_CHECK_HEADERS_ONCE([sys/time.h stdint.h])
+
+dnl Integer sizes
+AC_CHECK_SIZEOF(unsigned int)
+AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(time_t)
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(strings.h sys/types.h glob.h wctype.h locale.h langinfo.h sys/inotify.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_STRUCT_TM
+
+if test "$GCC" = yes; then
+	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
+        # Check for link-time optimization support
+        f=-flto=auto
+        AC_MSG_CHECKING([whether $CC supports $f])
+        if $CC -Werror -E $f - < /dev/null > /dev/null 2>&1 ; then
+            AC_MSG_RESULT([yes])
+            CFLAGS="$CFLAGS $f"
+            f=-ffat-lto-objects
+            AC_MSG_CHECKING([whether $CC supports $f])
+            if $CC -Werror -E $f - < /dev/null > /dev/null 2>&1 ; then
+                AC_MSG_RESULT([yes])
+                CFLAGS="$CFLAGS $f"
+            else
+                AC_MSG_RESULT([no])
+            fi
+        else
+            AC_MSG_RESULT([no])
+        fi
+fi
+
+dnl If sizeof(time_t) is 4, try to get 64-bit time_t
+if test "$ac_cv_sizeof_time_t" = "4" ; then
+    AC_MSG_NOTICE([time_t is 32-bits on this system; attempting to use 64-bit time_t])
+    CFLAGS="$CFLAGS -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
+fi
+
+if test "$ac_cv_perlartifacts" = "yes" ; then
+    PERLARTIFACTS=
+else
+    PERLARTIFACTS='NO_PACKLIST=1 NO_PERLLOCAL=1'
+fi
+
+RELEASE_DATE=`grep '[[0-9]][[0-9]][[0-9]][[0-9]]-[[0-9]][[0-9]]-[[0-9]][[0-9]]' docs/WHATSNEW  | head -n 1 | awk '{print $NF}'`
+
+# Sanity-check release date
+echo "$RELEASE_DATE" | grep '^....-..-..$' > /dev/null 2>&1
+if test "$?" != 0 ; then
+    echo "*** COULD NOT DETERMINE RELEASE DATE: docs/WHATSNEW is incorrect!"
+    exit 1
+fi
+AC_CHECK_FUNCS(strdup strcasecmp strncasecmp setenv unsetenv glob mbstowcs setlocale initgroups inotify_init1)
+
+VERSION=$PACKAGE_VERSION
+CONFIG_CMD="$0$ac_configure_args_raw"
+CONFIG_CMD=`echo "$CONFIG_CMD" | sed -e 's/"/\\\\"/g'`
+AC_DEFINE_UNQUOTED([CONFIG_CMD], ["$CONFIG_CMD"], [Configuration command used to build Remind])
+AC_SUBST(CONFIG_CMD)
+AC_SUBST(VERSION)
+AC_SUBST(PERL)
+AC_SUBST(PERLARTIFACTS)
+AC_SUBST(RELEASE_DATE)
+AC_CONFIG_FILES([src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind])
+AC_OUTPUT
+chmod a+x rem2pdf/bin/rem2pdf
+chmod a+x scripts/tkremind
--- a/configure.in
+++ b/configure.in
@@ -1,52 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(src/queue.c)
-
-cat <<'EOF'
-
-**********************
-*                    *
-* Configuring REMIND *
-*                    *
-**********************
-
-EOF
-
-AC_CONFIG_HEADER(src/config.h)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PATH_PROG([PERL], [perl])
-
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lm:
-
-AC_CHECK_LIB(m, sqrt)
-
-dnl Integer sizes
-AC_CHECK_SIZEOF(unsigned short)
-AC_CHECK_SIZEOF(unsigned int)
-AC_CHECK_SIZEOF(unsigned long)
-
-dnl Checks for header files.
-AC_CHECK_HEADERS(sys/types.h sys/file.h glob.h wctype.h locale.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_STRUCT_TM
-
-dnl Checks for library functions.
-AC_FUNC_UTIME_NULL
-AC_HEADER_TIME
-
-if test "$GCC" = yes; then
-	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
-fi
-
-AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=03.03.12
-AC_SUBST(VERSION)
-AC_SUBST(PERL)
-AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile)
--- a/contrib/ical2rem-0.8/GITHUB
+++ b/contrib/ical2rem-0.8/GITHUB
@@ -0,0 +1,3 @@
+The upstream GitHub project for ical2rem is:
+
+https://github.com/jbalcorn/ical2rem
--- a/contrib/ical2rem-0.8/LICENSE
+++ b/contrib/ical2rem-0.8/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/contrib/ical2rem-0.8/README.md
+++ b/contrib/ical2rem-0.8/README.md
@@ -0,0 +1,103 @@
+# ical2rem
+The original iCal to Remind script, first released in 2005.
+
+Reads iCal files and outputs remind-compatible files.   Tested ONLY with
+  calendar files created by Mozilla Calendar/Sunbird. Use at your own risk.
+
+## License
+In 2005, this was released with the Gnu Public License V2.  However, I am changing it to the MIT License, since that provides greater freedom to do with this code what you want.
+
+Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
+
+## How I use Remind and Google Calendar together
+
+  - My family has a Google Email domain, and our email addresses all end in the same domain. We all use Google Calendars and I want to mail reminders to each of the family members containing both Google Calendar and .reminder information.
+  - Under my ~/.rem/ directory each family member has a directory.  Each directory contains a standard remind file called 'reminders' that at the very least has the line "INCLUDE /home/jalcorn/.rem/<username>/ical2rem" and flag files indicating whether they want Daily or Weekly reminders.  My reminders files references my standard .reminders file, and I also have a flag so if I run a Test run I'll get it.  There's actually a lot more files (I have a big family).
+````
+  ./rem
+    ./son1:
+      drwxrwxr-x  2 jalcorn jalcorn 4096 Dec 12 14:02 .
+      drwxr-xr-x 12 jalcorn jalcorn 4096 Dec 12 14:13 ..
+      -rw-rw-r--  1 jalcorn jalcorn   51 Mar  3 06:10 ical2rem
+      lrwxrwxrwx  1 jalcorn jalcorn   33 Oct 27  2016 son1.ics -> /home/jalcorn/calendars/son1.ics
+      -rw-rw-r--  1 jalcorn jalcorn  976 Dec 12 14:02 reminders
+      -rw-rw-r--  1 jalcorn jalcorn    0 Oct 27  2016 Weekly
+
+    ./justin:
+      drwxrwxr-x  2 jalcorn jalcorn  4096 Feb 27 08:29 .
+      drwxr-xr-x 12 jalcorn jalcorn  4096 Dec 12 14:13 ..
+      lrwxrwxrwx  1 jalcorn jalcorn    32 Oct 27  2016 son1.ics -> /home/jalcorn/calendars/son1.ics
+      -rw-rw-r--  1 jalcorn jalcorn     0 Nov  7  2016 Daily
+      lrwxrwxrwx  1 jalcorn jalcorn    34 Oct 27  2016 family.ics -> /home/jalcorn/calendars/family.ics
+      -rw-rw-r--  1 jalcorn jalcorn 37320 Mar  3 06:10 ical2rem
+      lrwxrwxrwx  1 jalcorn jalcorn    34 Oct 27  2016 justin.ics -> /home/jalcorn/calendars/justin.ics
+      lrwxrwxrwx  1 jalcorn jalcorn    24 Nov  7  2016 reminders -> /home/jalcorn/.reminders
+      lrwxrwxrwx  1 jalcorn jalcorn    34 Oct 27  2016 vmd.ics -> /home/jalcorn/calendars/vmd.ics
+      -rw-rw-r--  1 jalcorn jalcorn     0 Oct 27  2016 Test
+      -rw-rw-r--  1 jalcorn jalcorn     0 Nov  7  2016 Weekly
+````
+  - bin/getgooglecals.sh runs out of crontab and downloads whatever calendars I want. Note that we can also download organization calendars, I've included a public one here (Cleveland Heights Vocal Music Department calendar).
+  - dailyreminders.sh is linked to weeklyreminders.sh and testreminders.sh so I can run it in different modes. The concatenate the various calendar outputs as a single remind file then send the reminders via email.
+### Example: .rem/son1/reminders file:
+````
+INCLUDE /home/jalcorn/.rem/defs.rem
+INCLUDE /home/jalcorn/.rem/float
+INCLUDE /home/jalcorn/.rem/son1/ical2rem
+fset _weeks() coerce("STRING", (trigdate()-today())/7) + plural((trigdate()-today())/7, " week")
+FSET _sfun(x) choose(x, -60, 30, 5, 0)
+FSET oldfloat(y,m,d) trigger(MAX(realtoday(), date(y,m,d)))
+FSET due(y,m,d) "(" + (date(y,m,d)-trigdate()) + ")"
+SET fullmoon moondate(2)
+REM [trigger(realtoday())] SPECIAL SHADE 145 70 100 %
+REM [float(2019,4,15,105)] MSG File tax return [due(2017,4,15)]%
+REM PRIORITY 9999 MSG %"%"%
+INCLUDE /home/jalcorn/.rem/bdays
+SET $LongDeg 81
+SET $LongMin 11
+SET $LongSec 11
+SET $LatDeg 41
+SET $LatMin 11
+SET $LatSec 11
+REM [trigger(moondate(2))] +1 MSG %"Full Moon%" %b%
+fset _srtd() coerce("STRING", _no_lz(_am_pm(sunrise(today()))))
+fset _sstd() coerce("STRING", _no_lz(_am_pm(sunset(today()))))
+MSG Sun is up today from [_srtd()] to [_sstd()].%"%"%
+````
+## Revision History
+### Version 0.7 2024-09-04
+  - ISSUE 8: New version of remind complains if _sfun isn't defined. Output a header
+	to define a function that does nothing if the function doesn't exist.
+### Version 0.6 2019-03-01
+  - Publish on GitHub and change license to MIT License
+  - Add supporting files and explanation of how I use it
+### version 0.5.2 2007-03-23
+      - BUG: leadtime for recurring events had a max of 4 instead of DEFAULT_LEAD_TIME
+      - remove project-lead-time, since Category was a non-standard attribute
+      - NOTE: There is a bug in iCal::Parser v1.14 that causes multiple calendars to
+              fail if a calendar with recurring events is followed by a calendar with no
+              recurring events.  This has been reported to the iCal::Parser author.
+### version 0.5.1 2007-03-21
+      - BUG: Handle multiple calendars on STDIN
+      - add --heading option for priority on section headers
+### version 0.5 2007-03-21
+      - Add more help options
+      - --project-lead-time option
+      - Supress printing of heading if there are no todos to print
+### version 0.4
+      - Version 0.4 changes all written or inspired by, and thanks to Mark Stosberg
+      - Change to GetOptions
+      - Change to pipe
+      - Add --label, --help options
+      - Add Help Text
+      - Change to subroutines
+      - Efficiency and Cleanup
+### version 0.3
+      - Convert to GPL (Thanks to Mark Stosberg)
+      - Add usage
+### version 0.2
+      - add command line switches
+      - add debug code
+      - add SCHED _sfun keyword
+      - fix typos
+### version 0.1 - ALPHA CODE.
+
--- a/contrib/ical2rem-0.8/cal_futureonly.pl
+++ b/contrib/ical2rem-0.8/cal_futureonly.pl
@@ -0,0 +1,82 @@
+#!/usr/bin/perl -w
+#
+# cal_futureonly.pl - 
+# Reads iCal files and outputs events between 1 month ago and 1 year from now.
+# Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
+
+=head1 SYNOPSIS
+
+ cal_futureonly.pl --file=filname.ics > output.ics
+
+ --help				   Usage
+ --man				   Complete man page
+ --infile				   (REQUIRED) name of input calendar file
+ --file				   (REQUIRED) name of output calendar file
+
+Expects an ICAL stream on STDIN. Converts it to the format
+used by the C<remind> script and prints it to STDOUT. 
+
+=head2 --infile
+
+Input file
+
+=head2 --file 
+
+Output File
+
+=cut 
+
+use strict;
+use Data::ICal;
+use Data::ICal::Entry;
+use DateTime::Span;
+use Data::ICal::DateTime;
+use DateTime;
+use Getopt::Long 2.24 qw':config auto_help';
+use Pod::Usage;
+use Data::Dumper;
+use vars '$VERSION';
+$VERSION = "0.1";
+
+my $help;
+my $man;
+my $infile;
+my $file;
+my $debug = 0;
+
+GetOptions (
+	"help|?" 	  => \$help, 
+	"man" 	 	  => \$man,
+    "debug"       => \$debug,
+    "infile=s"    => \$infile,
+	"file=s"      => \$file
+);
+pod2usage(1) if $help;
+pod2usage(1) if (! $file);
+pod2usage(-verbose => 2) if $man;
+
+my $limit = DateTime->now();
+$limit->subtract( months => 1);
+my $endlimit = DateTime->now()->add(years =>1);
+print STDERR "including events from: ",$limit->ymd," to: ".$endlimit->ymd,"\n" if $debug;
+my $span  = DateTime::Span->from_datetimes( start => $limit, end => $endlimit );
+print STDERR "Parsing $infile\n" if $debug;
+my $cal = Data::ICal->new(filename => $infile);
+if (! $cal) {
+	die "Died Trying to read $infile :".$cal->error_message;
+}
+#my $archive = Data::ICal->new(filename => 'archive.ics');
+print "Output = $file\n" if $debug;
+my $new = Data::ICal->new();
+if (! $new) {
+	die $new->error_message;
+}
+
+my @events = $cal->events($span);
+$new->add_entries(@events);
+
+open(NEW, ">$file");
+print NEW $new->as_string;
+close NEW;
+exit 0;
+#:vim set ft=perl ts=4 sts=4 expandtab :
--- a/contrib/ical2rem-0.8/dailyreminders.sh
+++ b/contrib/ical2rem-0.8/dailyreminders.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+r=`basename $0`
+
+if [ $r == 'weeklyreminders.sh' ];
+then
+	t=14;
+	w=Weekly;
+elif [ $r ==  'dailyreminders.sh' ];
+then
+	t=3;
+	w=Daily;
+else
+	t=5
+	w=Test;
+fi
+
+cd .rem
+for d in * ;
+do
+	if [ "$( ls -A $d/$w 2>/dev/null )" ];
+	then
+		echo "Sending a $w reminder to $d"
+		ft=/tmp/$d-t-$$.txt
+		f=/tmp/$d-$$.txt
+		echo "Reminders for next $t days:" >> $f
+		cat /dev/null > $d/ical2rem
+		for c in $d/*.ics
+		do
+			calname=`basename $c .ics | tr a-z A-Z`
+			cat $c 2>/dev/null | sed -e "s/^SUMMARY:/SUMMARY: {${calname}} /" \
+				| sed -e 's/DT\([A-Z]*\);TZID=UTC:\([0-9T]*\)/DT\1:\2Z/' >> $ft
+		done
+		cat $ft | ~/bin/ical2rem.pl --label "Online Calendar" --heading "PRIORITY 9999" --lead-time $t >> $d/ical2rem
+			if [ -e $d/reminders ];then r="${d}/reminders"; else r="${d}/ical2rem";fi
+			/usr/bin/remind -q -iplain=1 $r >> $f
+		echo "
+All calendars can be accessed by logging into https://calendar.google.com/ as $d@jalcorn.net
+" >> $f
+		cat $f	| mail -s "$w Reminders for $d" $d@jalcorn.net;
+		cat $f
+		rm $f
+		rm $ft
+	fi; 
+done
--- a/contrib/ical2rem-0.8/getgooglecals.sh
+++ b/contrib/ical2rem-0.8/getgooglecals.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+#   Get google calendars, fix issues caused by changes in Google calendars, and remove all past events.
+#
+#   Obviously, I've removed the private hashes from private calendars.
+#
+cd ~/calendars
+wget -q -O full/justin.ics --no-check-certificate https://www.google.com/calendar/ical/jbalcorn\%40gmail.com/private-aaaaaaaaaaaaaaaaaaaaaaaaaa/basic.ics
+wget -q -O full/family.ics --no-check-certificate https://www.google.com/calendar/ical/jalcorn.net_aaaaaaaaaaaaaaaaaaaaaaaaaa\%40group.calendar.google.com/private-6c42a79dec0b3b3bb7b9b0ebf9776bc1/basic.ics
+wget -q -O full/son1.ics --no-check-certificate https://www.google.com/calendar/ical/son1\%40jalcorn.net/private-aaaaaaaaaaaaaaaaaaaaaaaaaa/basic.ics
+wget -q -O full/vmd.ics --no-check-certificate https://calendar.google.com/calendar/ical/chuh.org_0pmkefjkiqc4snoel7occlslh8%40group.calendar.google.com/public/basic.ics
+
+for i in full/*.ics;do
+                cat $i 2>/dev/null | sed -e 's/DT\([A-Z]*\);TZID=UTC:\([0-9T]*\)/DT\1:\2Z/' > /tmp/temp.ics
+                cp /tmp/temp.ics $i
+done
+
+~/bin/cal_futureonly.pl --infile=full/justin.ics --file=justin.ics
+~/bin/cal_futureonly.pl --infile=full/family.ics --file=family.ics
+~/bin/cal_futureonly.pl --infile=full/son1.ics --file=son1.ics
+~/bin/cal_futureonly.pl --infile=full/vmd.ics --file=vmd.ics
--- a/contrib/ical2rem-0.8/ical2rem.pl
+++ b/contrib/ical2rem-0.8/ical2rem.pl
@@ -0,0 +1,396 @@
+#!/usr/bin/perl -w
+#
+# ical2rem.pl - 
+# Reads iCal files and outputs remind-compatible files.   Tested ONLY with
+#   calendar files created by Mozilla Calendar/Sunbird. Use at your own risk.
+# MIT License
+# 
+# Copyright (c) 2005, 2007, 2019 Justin B. Alcorn
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+# version 0.8 2024-10-16
+#   - Issue 9. Remove extra day notation on all day events.
+# version 0.7.1 2024-09-19
+#       - Made sure license statements were consistent
+# version 0.7 2024-09-04
+#       - Added dummy _sfun to resolve Issue #8
+# version 0.6 2019-03-01
+#       - Updates to put on GitHub
+# version 0.5.2 2007-03-23
+#   - BUG: leadtime for recurring events had a max of 4 instead of DEFAULT_LEAD_TIME
+#   - remove project-lead-time, since Category was a non-standard attribute
+#   - NOTE: There is a bug in iCal::Parser v1.14 that causes multiple calendars to
+#       fail if a calendar with recurring events is followed by a calendar with no
+#       recurring events.  This has been reported to the iCal::Parser author.
+# version 0.5.1 2007-03-21
+#   - BUG: Handle multiple calendars on STDIN
+#   - add --heading option for priority on section headers
+# version 0.5 2007-03-21
+#   - Add more help options
+#   - --project-lead-time option
+#   - Supress printing of heading if there are no todos to print
+# version 0.4
+#   - Version 0.4 changes all written or inspired by, and thanks to Mark Stosberg
+#   - Change to GetOptions
+#   - Change to pipe
+#   - Add --label, --help options
+#   - Add Help Text
+#   - Change to subroutines
+#   - Efficiency and Cleanup
+# version 0.3
+#   - Convert to GPL (Thanks to Mark Stosberg)
+#   - Add usage
+# version 0.2
+#   - add command line switches
+#   - add debug code
+#   - add SCHED _sfun keyword
+#   - fix typos
+# version 0.1 - ALPHA CODE.  
+
+=head1 SYNOPSIS
+
+ cat /path/to/file*.ics | ical2rem.pl > ~/.ical2rem
+
+ All options have reasonable defaults:
+ --label           Calendar name (Default: Calendar)
+ --start               Start of time period to parse (parsed by str2time)
+ --end                 End of time period to parse
+ --lead-time           Advance days to start reminders (Default: 3)
+ --todos, --no-todos   Process Todos? (Default: Yes)
+ --iso8601             Use YYYY-MM-DD date format
+ --locations, --no-locations  Include location? (Default: Yes)
+ --end-times, --no-end-times  Include event end times in reminder text
+                              (Default: No)
+ --heading             Define a priority for static entries
+ --help            Usage
+ --debug           Enable debug output
+ --man             Complete man page
+
+Expects an ICAL stream on STDIN. Converts it to the format
+used by the C<remind> script and prints it to STDOUT. 
+
+=head2 --label
+
+  ical2rem.pl --label "Bob's Calendar"
+
+The syntax generated includes a label for the calendar parsed.
+By default this is "Calendar". You can customize this with 
+the "--label" option.
+
+=head2 --iso8601
+
+Use YYYY-MM-DD date format in output instead of Mmm DD YYYY
+
+=head2 --locations, --no-locations
+
+Whether or not to include locations in events
+
+=head2 --lead-time 
+
+  ical2rem.pl --lead-time 3
+ 
+How may days in advance to start getting reminders about the events. Defaults to 3. 
+
+=head2 --no-todos
+
+  ical2rem.pl --no-todos
+
+If you don't care about the ToDos the calendar, this will surpress
+printing of the ToDo heading, as well as skipping ToDo processing. 
+
+=head2 --heading
+
+  ical2rem.pl --heading "PRIORITY 9999"
+
+Set an option on static messages output.  Using priorities can made the static messages look different from
+the calendar entries.  See the file defs.rem from the remind distribution for more information.
+
+=cut 
+
+use strict;
+use iCal::Parser;
+use Date::Parse;
+use DateTime;
+use Getopt::Long 2.24 qw':config auto_help';
+use Pod::Usage;
+use Data::Dumper;
+use vars '$VERSION';
+$VERSION = "0.5.2";
+
+# Declare how many days in advance to remind
+my $DEFAULT_LEAD_TIME = 3;
+my $PROCESS_TODOS     = 1;
+my $HEADING           = "";
+my $help;
+my $debug;
+my $man;
+my $iso8601;
+my $do_location = 1;
+my $do_end_times;
+my $start;
+my $end;
+
+my $label = 'Calendar';
+GetOptions (
+    "label=s"     => \$label,
+    "start=s"     => \$start,
+    "end=s"       => \$end,
+    "lead-time=i" => \$DEFAULT_LEAD_TIME,
+    "todos!"      => \$PROCESS_TODOS,
+    "iso8601!"    => \$iso8601,
+    "locations!"  => \$do_location,
+    "end-times!"  => \$do_end_times,
+    "heading=s"   => \$HEADING,
+    "help|?"      => \$help, 
+    "debug"       => \$debug,
+    "man"         => \$man
+) or pod2usage(1);
+pod2usage(1) if $help;
+pod2usage(-verbose => 2) if $man;
+
+my $month = ['None','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
+
+my @calendars;
+my $in;
+
+while (<>) {
+    $in .= $_;
+    if (/END:VCALENDAR/) {
+        push(@calendars,$in);
+        $in = "";
+    }
+}
+print STDERR "Read all calendars\n" if $debug;
+my(%parser_opts) = ("debug" => $debug);
+if ($start) {
+    my $t = str2time($start);
+    die "Invalid time $start\n" if (! $t);
+    $parser_opts{'start'} = DateTime->from_epoch(epoch => $t);
+}
+if ($end) {
+    my $t = str2time($end);
+    die "Invalid time $end\n" if (! $t);
+    $parser_opts{'end'} = DateTime->from_epoch(epoch => $t);
+}
+print STDERR "About to parse calendars\n" if $debug;
+my $parser = iCal::Parser->new(%parser_opts);
+my $hash = $parser->parse_strings(@calendars);
+print STDERR "Calendars parsed\n" if $debug;
+
+##############################################################
+#
+# Subroutines 
+#
+#############################################################
+#
+# _process_todos()
+# expects 'todos' hashref from iCal::Parser is input
+# returns String to output
+sub _process_todos {
+    my $todos = shift; 
+    
+    my ($todo, @newtodos, $leadtime);
+    my $output = "";
+
+    $output .=  'REM '.$HEADING.' MSG '.$label.' ToDos:%"%"%'."\n";
+
+# For sorting, make sure everything's got something
+#   To sort on.  
+    my $now = DateTime->now;
+    for $todo (@{$todos}) {
+        # remove completed items
+        if ($todo->{'STATUS'} && $todo->{'STATUS'} eq 'COMPLETED') {
+            next;
+        } elsif ($todo->{'DUE'}) {
+            # All we need is a due date, everything else is sugar
+            $todo->{'SORT'} = $todo->{'DUE'}->clone;
+        } elsif ($todo->{'DTSTART'}) {
+            # for sorting, sort on start date if there's no due date
+            $todo->{'SORT'} = $todo->{'DTSTART'}->clone;
+        } else {
+            # if there's no due or start date, just make it now.
+            $todo->{'SORT'} = $now;
+        }
+        push(@newtodos,$todo);
+    }
+    if (! (scalar @newtodos)) {
+        return "";
+    }
+# Now sort on the new Due dates and print them out.  
+    for $todo (sort { DateTime->compare($a->{'SORT'}, $b->{'SORT'}) } @newtodos) {
+        my $due = $todo->{'SORT'}->clone();
+        my $priority = "";
+        if (defined($todo->{'PRIORITY'})) {
+            if ($todo->{'PRIORITY'} == 1) {
+                $priority = "PRIORITY 1000";
+            } elsif ($todo->{'PRIORITY'} == 3) {
+                $priority = "PRIORITY 7500";
+            }
+        }
+        if (defined($todo->{'DTSTART'}) && defined($todo->{'DUE'})) {
+            # Lead time is duration of task + lead time
+            my $diff = ($todo->{'DUE'}->delta_days($todo->{'DTSTART'})->days())+$DEFAULT_LEAD_TIME;
+            $leadtime = "+".$diff;
+        } else {
+            $leadtime = "+".$DEFAULT_LEAD_TIME;
+        }
+        $output .=  "REM ".$due->month_abbr." ".$due->day." ".$due->year." $leadtime $priority MSG \%a $todo->{'SUMMARY'}\%\"\%\"\%\n";
+    }
+    $output .= 'REM '.$HEADING.' MSG %"%"%'."\n";
+    return $output;
+}
+
+
+#######################################################################
+#
+#  Main Program
+#
+######################################################################
+
+# Issue 8 https://github.com/jbalcorn/ical2rem/issues/8
+# Make sure there is a _sfun function declared in the reminder file.  We'll just make it do nothing here.
+print 'IF args("_sfun") < 1
+    FSET _sfun(x) choose(x,0)
+ENDIF
+';
+
+print _process_todos($hash->{'todos'}) if $PROCESS_TODOS;
+
+my ($leadtime, $yearkey, $monkey, $daykey,$uid,%eventsbyuid);
+print 'REM '.$HEADING.' MSG '.$label.' Events:%"%"%'."\n";
+my $events = $hash->{'events'};
+foreach $yearkey (sort keys %{$events} ) {
+    my $yearevents = $events->{$yearkey};
+    foreach $monkey (sort {$a <=> $b} keys %{$yearevents}){
+        my $monevents = $yearevents->{$monkey};
+        foreach $daykey (sort {$a <=> $b} keys %{$monevents} ) {
+            my $dayevents = $monevents->{$daykey};
+            foreach $uid (sort {
+                            DateTime->compare($dayevents->{$a}->{'DTSTART'}, $dayevents->{$b}->{'DTSTART'})    
+                            } keys %{$dayevents}) {
+                my $event = $dayevents->{$uid};
+                if ($eventsbyuid{$uid}) {
+                    my $curreventday = $event->{'DTSTART'}->clone;
+                    $curreventday->truncate( to => 'day' );
+                    $eventsbyuid{$uid}{$curreventday->epoch()} =1;
+                    for (my $i = 0;$i < $DEFAULT_LEAD_TIME && !defined($event->{'LEADTIME'});$i++) {
+                        if ($eventsbyuid{$uid}{$curreventday->subtract( days => $i+1 )->epoch() }) {
+                            $event->{'LEADTIME'} = $i;
+                        }
+                    }
+                    # Issue 9. Multi-day events have extra day with zero time. Mark this as the date not needed in reminders file so we can skip later
+                    #   Repeating multi-day events have the same uid so we need to mark each one.
+                    if ($event->{'DTSTART'} eq $event->{'DTEND'} and $event->{'DTEND'}->hour eq 0 and $event->{'DTEND'}->minute eq 0 and $event->{'DTEND'}->second eq 0) {
+                        $eventsbyuid{$uid}{$event->{'DTSTART'}->ymd} = 'rm';
+                    }
+                } else {
+                    $eventsbyuid{$uid} = $event;
+                    my $curreventday = $event->{'DTSTART'}->clone;
+                    $curreventday->truncate( to => 'day' );
+                    $eventsbyuid{$uid}{$curreventday->epoch()} =1;
+                }
+            }
+        }
+    }
+}
+foreach $yearkey (sort keys %{$events} ) {
+    my $yearevents = $events->{$yearkey};
+    foreach $monkey (sort {$a <=> $b} keys %{$yearevents}){
+        my $monevents = $yearevents->{$monkey};
+        foreach $daykey (sort {$a <=> $b} keys %{$monevents} ) {
+            my $dayevents = $monevents->{$daykey};
+            foreach $uid (sort {
+                            DateTime->compare($dayevents->{$a}->{'DTSTART'}, $dayevents->{$b}->{'DTSTART'})
+                            } keys %{$dayevents}) {
+                my $event = $dayevents->{$uid};
+                if (exists($event->{'LEADTIME'})) {
+                    $leadtime = "+".$event->{'LEADTIME'};
+                } else {
+                    $leadtime = "+".$DEFAULT_LEAD_TIME;
+                }
+                my $start = $event->{'DTSTART'};
+                my $end = $event->{'DTEND'};
+                my $duration = "";
+                # Issue 9. All Day events create an event that has zero length and DTSTART and DTEND at 00:00 on last day. Marked while handling multi-day events. Ignore these
+                if ($start eq $end and $eventsbyuid{$uid}{$start->ymd} and $eventsbyuid{$uid}{$start->ymd} eq 'rm') {
+                    next;
+                }
+                if ($end and ($start->hour or $start->minute or $end->hour or $end->minute)) {
+                    # We need both an HH:MM version of the delta, to put in the
+                    # DURATION specifier, and a human-readable version of the
+                    # delta, to put in the message if the user requested it.
+                    my $seconds = $end->epoch - $start->epoch;
+                    my $minutes = int($seconds / 60);
+                    my $hours = int($minutes / 60);
+                    $minutes -= $hours * 60;
+                    $duration = sprintf("DURATION %d:%02d ", $hours, $minutes);
+                }
+                print "REM ";
+                if ($iso8601) {
+                    print $start->strftime("%F ");
+                } else {
+                    print $start->month_abbr." ".$start->day." ".$start->year." ";
+                }
+                print "$leadtime ";
+                if ($duration or $start->hour > 0 or $start->minute > 0) {
+                    print "AT ";
+                    print $start->strftime("%H:%M");
+                    print " SCHED _sfun ${duration}MSG %a %2 ";
+                } else {
+                    print "MSG %a ";
+                }
+                print "%\"", &quote($event->{'SUMMARY'});
+                print(" at ", &quote($event->{'LOCATION'}))
+                    if ($do_location and $event->{'LOCATION'});
+                print "\%\"";
+                if ($do_end_times and ($start->hour or $start->minute or
+                                       $end->hour or $end->minute)) {
+                    my $start_date = $start->strftime("%F");
+                    my $start_time = $start->strftime("%k:%M");
+                    my $end_date = $end->strftime("%F");
+                    my $end_time = $end->strftime("%k:%M");
+                    # We don't want leading whitespace; some strftime's support
+                    # disabling the pdding in the format string, but not all,
+                    # so for maximum portability we do it ourselves.
+                    $start_time =~ s/^\s+//;
+                    $end_time =~ s/^\s+//;
+                    my(@pieces);
+                    if ($start_date ne $end_date) {
+                        push(@pieces, $end_date);
+                    }
+                    if ($start_time ne $end_time) {
+                        push(@pieces, $end_time);
+                    }
+                    print " (-", join(" ", @pieces), ")";
+                }
+                print "%\n";
+            }
+        }
+    }
+}
+
+sub quote {
+    local($_) = @_;
+    s/\[/["["]/g;
+    return $_;
+}
+
+exit 0;
+#:vim set ft=perl ts=4 sts=4 tabstop=4 expandtab :
--- a/contrib/ical2rem.pl
+++ b/contrib/ical2rem.pl
@@ -1,279 +0,0 @@
-#!/usr/bin/perl -w
-#
-# ical2rem.pl - 
-# Reads iCal files and outputs remind-compatible files.   Tested ONLY with
-#   calendar files created by Mozilla Calendar/Sunbird. Use at your own risk.
-# Copyright (c) 2005, 2007, Justin B. Alcorn
-
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-# version 0.5.2 2007-03-23
-# 	- BUG: leadtime for recurring events had a max of 4 instead of DEFAULT_LEAD_TIME
-#	- remove project-lead-time, since Category was a non-standard attribute
-#	- NOTE: There is a bug in iCal::Parser v1.14 that causes multiple calendars to
-#		fail if a calendar with recurring events is followed by a calendar with no
-#		recurring events.  This has been reported to the iCal::Parser author.
-# version 0.5.1 2007-03-21
-#	- BUG: Handle multiple calendars on STDIN
-#	- add --heading option for priority on section headers
-# version 0.5 2007-03-21
-#	- Add more help options
-#	- --project-lead-time option
-#	- Supress printing of heading if there are no todos to print
-# version 0.4
-#	- Version 0.4 changes all written or inspired by, and thanks to Mark Stosberg
-#	- Change to GetOptions
-#	- Change to pipe
-#	- Add --label, --help options
-#	- Add Help Text
-#	- Change to subroutines
-#	- Efficiency and Cleanup
-# version 0.3
-#	- Convert to GPL (Thanks to Mark Stosberg)
-#	- Add usage
-# version 0.2
-#	- add command line switches
-#	- add debug code
-#	- add SCHED _sfun keyword
-#	- fix typos
-# version 0.1 - ALPHA CODE.  
-
-=head1 SYNOPSIS
-
- cat /path/to/file*.ics | ical2rem.pl > ~/.ical2rem
-
- All options have reasonable defaults:
- --label		       Calendar name (Default: Calendar)
- --lead-time	       Advance days to start reminders (Default: 3)
- --todos, --no-todos   Process Todos? (Default: Yes)
- --heading			   Define a priority for static entries
- --help				   Usage
- --man				   Complete man page
-
-Expects an ICAL stream on STDIN. Converts it to the format
-used by the C<remind> script and prints it to STDOUT. 
-
-=head2 --label
-
-  ical2rem.pl --label "Bob's Calendar"
-
-The syntax generated includes a label for the calendar parsed.
-By default this is "Calendar". You can customize this with 
-the "--label" option.
-
-=head2 --lead-time 
-
-  ical2rem.pl --lead-time 3
- 
-How may days in advance to start getting reminders about the events. Defaults to 3. 
-
-=head2 --no-todos
-
-  ical2rem.pl --no-todos
-
-If you don't care about the ToDos the calendar, this will surpress
-printing of the ToDo heading, as well as skipping ToDo processing. 
-
-=head2 --heading
-
-  ical2rem.pl --heading "PRIORITY 9999"
-
-Set an option on static messages output.  Using priorities can made the static messages look different from
-the calendar entries.  See the file defs.rem from the remind distribution for more information.
-
-=cut 
-
-use strict;
-use iCal::Parser;
-use DateTime;
-use Getopt::Long 2.24 qw':config auto_help';
-use Pod::Usage;
-use Data::Dumper;
-use vars '$VERSION';
-$VERSION = "0.5.2";
-
-# Declare how many days in advance to remind
-my $DEFAULT_LEAD_TIME = 3;
-my $PROCESS_TODOS     = 1;
-my $HEADING			  = "";
-my $help;
-my $man;
-
-my $label = 'Calendar';
-GetOptions (
-	"label=s"     => \$label,
-	"lead-time=i" => \$DEFAULT_LEAD_TIME,
-	"todos!"	  => \$PROCESS_TODOS,
-	"heading=s"	  => \$HEADING,
-	"help|?" 	  => \$help, 
-	"man" 	 	  => \$man
-);
-pod2usage(1) if $help;
-pod2usage(-verbose => 2) if $man;
-
-my $month = ['None','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
-
-my @calendars;
-my $in;
-
-while (<>) {
-	$in .= $_;
-	if (/END:VCALENDAR/) {
-		push(@calendars,$in);
-		$in = "";
-	}
-}
-my $parser = iCal::Parser->new();
-my $hash = $parser->parse_strings(@calendars);
-
-##############################################################
-#
-# Subroutines 
-#
-#############################################################
-#
-# _process_todos()
-# expects 'todos' hashref from iCal::Parser is input
-# returns String to output
-sub _process_todos {
-	my $todos = shift; 
-	
-	my ($todo, @newtodos, $leadtime);
-	my $output = "";
-
-	$output .=  'REM '.$HEADING.' MSG '.$label.' ToDos:%"%"%'."\n";
-
-# For sorting, make sure everything's got something
-#   To sort on.  
-	my $now = DateTime->now;
-	for $todo (@{$todos}) {
-		# remove completed items
-		if ($todo->{'STATUS'} && $todo->{'STATUS'} eq 'COMPLETED') {
-			next;
-		} elsif ($todo->{'DUE'}) {
-			# All we need is a due date, everything else is sugar
-			$todo->{'SORT'} = $todo->{'DUE'}->clone;
-		} elsif ($todo->{'DTSTART'}) {
-			# for sorting, sort on start date if there's no due date
-			$todo->{'SORT'} = $todo->{'DTSTART'}->clone;
-		} else {
-			# if there's no due or start date, just make it now.
-			$todo->{'SORT'} = $now;
-		}
-		push(@newtodos,$todo);
-	}
-	if (! (scalar @newtodos)) {
-		return "";
-	}
-# Now sort on the new Due dates and print them out.  
-	for $todo (sort { DateTime->compare($a->{'SORT'}, $b->{'SORT'}) } @newtodos) {
-		my $due = $todo->{'SORT'}->clone();
-		my $priority = "";
-		if (defined($todo->{'PRIORITY'})) {
-			if ($todo->{'PRIORITY'} == 1) {
-				$priority = "PRIORITY 1000";
-			} elsif ($todo->{'PRIORITY'} == 3) {
-				$priority = "PRIORITY 7500";
-			}
-		}
-		if (defined($todo->{'DTSTART'}) && defined($todo->{'DUE'})) {
-			# Lead time is duration of task + lead time
-			my $diff = ($todo->{'DUE'}->delta_days($todo->{'DTSTART'})->days())+$DEFAULT_LEAD_TIME;
-			$leadtime = "+".$diff;
-		} else {
-			$leadtime = "+".$DEFAULT_LEAD_TIME;
-		}
-		$output .=  "REM ".$due->month_abbr." ".$due->day." ".$due->year." $leadtime $priority MSG \%a $todo->{'SUMMARY'}\%\"\%\"\%\n";
-	}
-	$output .= 'REM '.$HEADING.' MSG %"%"%'."\n";
-	return $output;
-}
-
-
-#######################################################################
-#
-#  Main Program
-#
-######################################################################
-
-print _process_todos($hash->{'todos'}) if $PROCESS_TODOS;
-
-my ($leadtime, $yearkey, $monkey, $daykey,$uid,%eventsbyuid);
-print 'REM '.$HEADING.' MSG '.$label.' Events:%"%"%'."\n";
-my $events = $hash->{'events'};
-foreach $yearkey (sort keys %{$events} ) {
-    my $yearevents = $events->{$yearkey};
-    foreach $monkey (sort {$a <=> $b} keys %{$yearevents}){
-        my $monevents = $yearevents->{$monkey};
-        foreach $daykey (sort {$a <=> $b} keys %{$monevents} ) {
-            my $dayevents = $monevents->{$daykey};
-            foreach $uid (sort {
-                            DateTime->compare($dayevents->{$a}->{'DTSTART'}, $dayevents->{$b}->{'DTSTART'})    
-                            } keys %{$dayevents}) {
-                my $event = $dayevents->{$uid};
-               if ($eventsbyuid{$uid}) {
-                    my $curreventday = $event->{'DTSTART'}->clone;
-                    $curreventday->truncate( to => 'day' );
-                    $eventsbyuid{$uid}{$curreventday->epoch()} =1;
-                    for (my $i = 0;$i < $DEFAULT_LEAD_TIME && !defined($event->{'LEADTIME'});$i++) {
-                        if ($eventsbyuid{$uid}{$curreventday->subtract( days => $i+1 )->epoch() }) {
-                            $event->{'LEADTIME'} = $i;
-                        }
-                    }
-                } else {
-                    $eventsbyuid{$uid} = $event;
-                    my $curreventday = $event->{'DTSTART'}->clone;
-                    $curreventday->truncate( to => 'day' );
-                    $eventsbyuid{$uid}{$curreventday->epoch()} =1;
-                }
-
-            }
-        }
-    }
-}
-foreach $yearkey (sort keys %{$events} ) {
-    my $yearevents = $events->{$yearkey};
-    foreach $monkey (sort {$a <=> $b} keys %{$yearevents}){
-        my $monevents = $yearevents->{$monkey};
-        foreach $daykey (sort {$a <=> $b} keys %{$monevents} ) {
-            my $dayevents = $monevents->{$daykey};
-            foreach $uid (sort {
-                            DateTime->compare($dayevents->{$a}->{'DTSTART'}, $dayevents->{$b}->{'DTSTART'})
-                            } keys %{$dayevents}) {
-                my $event = $dayevents->{$uid};
-                if (exists($event->{'LEADTIME'})) {
-                    $leadtime = "+".$event->{'LEADTIME'};
-                } else {
-                    $leadtime = "+".$DEFAULT_LEAD_TIME;
-                }
-                my $start = $event->{'DTSTART'};
-                print "REM ".$start->month_abbr." ".$start->day." ".$start->year." $leadtime ";
-                if ($start->hour > 0) { 
-                    print " AT ";
-                    print $start->strftime("%H:%M");
-                    print " SCHED _sfun MSG %a %2 ";
-                } else {
-                    print " MSG %a ";
-                }
-                print "%\"$event->{'SUMMARY'}";
-                print " at $event->{'LOCATION'}" if $event->{'LOCATION'};
-                print "\%\"%\n";
-            }
-        }
-    }
-}
-exit 0;
-#:vim set ft=perl ts=4 sts=4 expandtab :
--- a/contrib/rem2ics-0.93/rem2ics
+++ b/contrib/rem2ics-0.93/rem2ics
@@ -141,7 +141,7 @@ appear with exactly the text and exactly the same duration (including
 one VEVENT object, that will have a RFC2445 C<RDATE> property.

 B<rem2ics> is not yet smart enough to derive an C<RRULE> based
-recurrance.  If you really want that feature, either implement it and
+recurrence.  If you really want that feature, either implement it and
 send in a patch, or contact the author and convince him to do it.

 =head2 Other iCalendar Properties
@@ -164,7 +164,7 @@ runs.

 =head2 Other iCalendar Perl objects

-Why does't B<rem2ics> use any of the iCalendar Perl stuff in CPAN?
+Why doesn't B<rem2ics> use any of the iCalendar Perl stuff in CPAN?
 Because I don't trust them, and they are too big for this app.  One
 links to a binary library. Another hasn't been maintained since 1991,
 and is full of notes as to how buggy and incomplete it is.  And so
@@ -218,7 +218,7 @@ Bug fix, error message for non-recurring events
 Bug fix, 
 rem2ics 0.91 chokes on timed reminders with
 duration using `remind -s` as it functions in remind-03.01.03.
- Remind 3.01 changed how the -s data is formated for events that have a duration
+ Remind 3.01 changed how the -s data is formatted for events that have a duration
 Patch by Paul Hinze E<lt>paul dot t dot hinze at gmail dot comE<gt>
  and Michael Schultz E<lt>mjschultz at gmail dot comE<gt>

@@ -376,7 +376,7 @@ foreach $v (@events) {

 my(%grovel);

-# if the user doesnt want recurrance detection
+# if the user doesn't want recurrence detection
 unless ($options{norecurr}) {

    # then dont put events in the grovel hash
@@ -393,7 +393,7 @@ unless ($options{norecurr}) {
 	    $v = ${$grovel{$k}}[0];
 	    $v->{recurlist} = \@{$grovel{$k}};
 	    foreach my $v0 (@{$grovel{$k}}) {
-		$v0->{is_recurrance} = $v;
+		$v0->{is_recurrence} = $v;
 	    }
 	}
    }
@@ -409,12 +409,12 @@ unless ($options{norecurr}) {
 # might have a problem if a recurring event has two instances both on
 # the first day.

-# Every event that is recurring has a "is_recurrance" property.
+# Every event that is recurring has a "is_recurrence" property.
 # Additionally, (hopefully) the first/earliest event in a set of
-# recurrances has a "recurlist" property.  The "recurlist" is a
+# recurrences has a "recurlist" property.  The "recurlist" is a
 # reference to a list of references to each of the events.  The first
 # one on that list will be the same event that has the "recurlist"
-# property.  The "is_recurrance" property is a reference back to the
+# property.  The "is_recurrence" property is a reference back to the
 # event that has the "recurlist" property.

 foreach my $k (keys %grovel) {
@@ -466,8 +466,8 @@ foreach my $k (keys %grovel) {
 }

 foreach $v (@events) {
-    # for recurrant events, skip those that arnt the "head"
-    next if ($v->{is_recurrance} and (not $v->{recurlist}));
+    # for recurrent events, skip those that arnt the "head"
+    next if ($v->{is_recurrence} and (not $v->{recurlist}));

    if (${$v->{sf}}[4] eq "*") {  # no time was given
 	$v->{i_dtstart} = sprintf("DTSTART:%s", $v->{dts});
@@ -485,7 +485,7 @@ foreach $v (@events) {
    }

    if (${$v->{sf}}[3] ne "*") {  # a duration was given
-	# It's convienient that RFC2445 defines DURATION, thus we
+	# It's convenient that RFC2445 defines DURATION, thus we
 	# don't need to calculate DTEND, with awkward figuring out
 	# crossing hours, days, months, year, etc.  Instead we
 	# will let the iCalendar consuming application worry about it.
@@ -501,8 +501,8 @@ print "BEGIN:VCALENDAR\015\012"

 # output each vevent
 foreach $v (@events) {
-    # for recurrant events, only output the "head", skip the others
-    next if ($v->{is_recurrance} and (not $v->{recurlist}));
+    # for recurrent events, only output the "head", skip the others
+    next if ($v->{is_recurrence} and (not $v->{recurlist}));

    print "BEGIN:VEVENT\015\012";
    my $tag = ${$v->{sf}}[2];
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -5,7 +5,7 @@
 ;; Author: Shelagh Manton <shelagh.manton@gmail.com> with help from
 ;; Dianne Skoll
 ;; Keywords: remind configure convenience
-;; Version: 0.14
+;; Version: 0.15-dfs2

 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License
@@ -19,8 +19,7 @@

 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA

 ;;; Commentary:

@@ -91,7 +90,6 @@
 (define-key remind-conf-mode-map "\C-c\C-x" 'rem-tomorrow)
 (define-key remind-conf-mode-map "\C-c\C-a" 'rem-days-away)
 (define-key remind-conf-mode-map "\M-j" 'remind-indent-line)
-(define-key remind-conf-mode-map (kbd "RET") 'remind-indent-line)
 (define-key remind-conf-mode-map "\C-c\C-c" 'rem-save-file)

 ;; syntax-table
@@ -111,12 +109,16 @@

 (defconst remind-keywords
  (sort
-   (list "RUN" "REM" "ONCE" "SATISFY" "BEFORE" "UNSET" "OMIT" "FIRST" "SATISFY"
-	 "OMIT" "DATE" "SKIP" "ONCE" "AFTER" "WARN" "PRIORITY" "AT" "SCHED" "IF" "ELSE" "ENDIF"
-	 "WARN" "UNTIL" "THROUGH" "SCANFROM" "DURATION" "TAG" "MSG" "MSF" "CAL" "SPECIAL" "IFTRIG"
-	 "PS" "PSFILE" "BANNER" "INCLUDE" "PUSH-OMIT-CONTEXT" "DEBUG" "DUMPVARS" "PUSH" "CLEAR" "POP"
-	 "CLEAR-OMIT-CONTEXT" "POP-OMIT-CONTEXT"  "SET" "ERRMSG" "FSET" "DUMP" "BAN" "INC" "SCAN"
-	 "EXIT" "FLUSH" "PRESERVE" "MOON" "COLOR" "UNSET")
+   (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" "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" "PRESERVE"
+         "PRIORITY" "PS" "PSFILE" "PUSH" "PUSH-OMIT-CONTEXT" "REM" "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)))))


@@ -127,35 +129,60 @@

 (defconst remind-builtin-variables
  (sort
-   (list "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DefaultPrio" "$DontFork" "$DontTrigAts" "$DontQueue"
-	 "$EndSent" "$EndSentIg" "$NumTrig" "$FirstIndent" "$FoldYear" "$FormWidth" "$HushMode"
-	 "$IgnoreOnce" "$InfDelta" "$NextMode" "$NumQueued" "$NumTrig" "$PrefixLineNo" "$PSCal" "$RunOff"
-	 "$SimpleCal" "$SortByDate" "$SortByPrio" "$MinsFromUTC" "$LatDeg" "$LatMin" "$LatSec" "$EndSent"
-	 "$EndSentIg" "$Location" "$LongDeg" "$LongMin" "$LongSec" "$MaxSatIter" "$SubsIndent" "$T" "$Td"
-	 "$Tm" "$Tw" "$Ty" "$TimeSep" "$UntimedFirst" "$U" "$Ud" "$Um" "$Uw" "$Uy")
+   (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"
+         "$IgnoreOnce" "$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$July"
+         "$June" "$LatDeg" "$Latitude" "$LatMin" "$LatSec" "$Location"
+         "$LongDeg" "$Longitude" "$LongMin" "$LongSec" "$March" "$MaxFullOmits"
+         "$MaxLateMinutes" "$MaxPartialOmits" "$MaxSatIter" "$MaxStringLen"
+         "$May" "$MinsFromUTC" "$Minute" "$Monday" "$Mplu" "$NextMode"
+         "$November" "$Now" "$NumFullOmits" "$NumPartialOmits" "$NumQueued"
+         "$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"
+         "$Tomorrow" "$Tt" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um"
+         "$UntimedFirst" "$Use256Colors" "$UseBGVTColors" "$UseTrueColors"
+         "$UseVTColors" "$Uw" "$Uy" "$Was" "$Wednesday")
   #'(lambda (a b) (> (length a) (length b)))))

-
 (defconst remind-time-words
  (sort
-   (list "Jan" "January" "Feb" "Mar" "Apr" "Jun" "Jul" "Aug" "Sept" "Sep" "Oct" "Nov" "Dec"
-	 "February" "March" "April" "May" "June" "July" "August" "September" "October"
-	 "November" "December" "Mon" "Monday" "Tue" "Tues" "Tuesday" "Wed" "Wednesday"
-	 "Thu" "Thursday" "Thurs" "Fri" "Friday" "Saturday" "Sat" "Sun" "Sunday")
+   (list "Apr" "April" "Aug" "August" "Dec" "December" "Feb" "February"
+         "Jan" "January" "Jul" "July" "Jun" "June" "Mar" "March" "May"
+         "Nov" "November" "Oct" "October" "Sep" "September" "Fri"
+         "Friday" "Mon" "Monday" "Sat" "Saturday" "Sun" "Sunday" "Thu"
+         "Thursday" "Tue" "Tuesday" "Wed" "Wednesday")
   #'(lambda (a b) (> (length a) (length b)))))

-
 (defconst remind-builtin-functions
  (sort
-   (list "abs" "access" "args" "asc" "baseyr" "char" "choose" "coerce" "current" "date" "datetime" "datepart" 
-	 "dawn" "day" "daysinmon" "defined" "dosubst" "dusk" "easter" "easterdate" "evaltrig" "filedate" 
-	 "filedatetime" "filedir" "filename" "getenv" "hebdate" "hebday" "hebmon" "hebyear" "hour" "iif" "index" "isdst" 
-	 "isleap" "isomitted" "language" "lower" "max" "min" "minute" "minsfromutc" "mon" "monnum" "moondate" "moondatetime"
-	 "moonphase" "moontime" "msgprefix" "msgsuffix" "nonomitted" "now" "ord" "ostype" "plural" 
-	 "psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell" "slide" "strlen" "substr" "sunrise" "sunset" "time" "timepart" 
-	 "thisyear" "today" "trigdate" "trigdatetime" "trigger" "trigger" "trigtime" "trigvalid" "typeof" "tzconvert" "upper" "value" 
-	 "version" "weekno" "wkday" "wkdaynum" "year"
-	 )
+   (list "_" "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
+         "baseyr" "char" "choose" "coerce" "columns" "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" "moonrise" "moonrisedir" "moonset" "moonsetdir" "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"
+         "trigscanfrom" "trigtags" "trigtime" "trigtimedelta" "trigtimerep"
+         "triguntil" "trigvalid" "typeof" "tzconvert" "upper" "utctolocal"
+         "value" "version" "weekno" "wkday" "wkdaynum" "year"
+         )
   #'(lambda (a b) (> (length a) (length b)))))

 ;;; faces
@@ -164,21 +191,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)

@@ -192,7 +219,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)

@@ -213,14 +240,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)

@@ -244,29 +271,52 @@
 :group 'remind-conf
 )

+(defconst remind-keywords-regex (regexp-opt remind-keywords 'words))
+(defconst remind-type-keywords-regex (regexp-opt remind-type-keywords 'words))
+(defconst remind-builtin-variables-regex (regexp-opt remind-builtin-variables 'words))
+(defconst remind-builtin-functions-regex (regexp-opt remind-builtin-functions 'words))
+(defconst remind-time-words-regex (regexp-opt remind-time-words 'words))
+
+;; Case-insensitive matching functions
+(defun remind-keywords-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-keywords-regex limit 'no-error)))
+(defun remind-type-keywords-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-type-keywords-regex limit 'no-error)))
+(defun remind-builtin-variables-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-builtin-variables-regex limit 'no-error)))
+(defun remind-builtin-functions-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-builtin-functions-regex limit 'no-error)))
+(defun remind-time-words-matcher (limit)
+  (let ((case-fold-search t))
+    (re-search-forward remind-time-words-regex limit 'no-error)))
+
 ;; keywords

 (defconst remind-conf-font-lock-keywords-1
  (list
-   '("^[\;\#]\\s-+.*$" . remind-comment-face)
-   (cons (regexp-opt remind-keywords 'words) remind-conf-keyword-face)
+   '("^\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
 	  (list
-	   (cons (regexp-opt remind-time-words 'words) remind-time-face)
-	   (cons (regexp-opt remind-builtin-functions 'words) remind-conf-command-face)
+           '(remind-time-words-matcher . remind-time-face)
+           '(remind-builtin-functions-matcher . remind-conf-command-face)
 	   '("%$" . remind-conf-endline-face)))
  "Additional commands to highlight in `remind-conf-mode'.")

 (defconst remind-conf-font-lock-keywords-3
  (append remind-conf-font-lock-keywords-2
 	  (list
-	   (cons (regexp-opt remind-type-keywords 'words) remind-conf-type-face)
+           '(remind-type-keywords-matcher . remind-conf-type-face)
 	   '("\[[a-zA-Z]\\{3,6\\}\]" . remind-conf-color-face)
 	   '("\\s-+\\([12][0-9]\\|3[01]\\|0?[0-9]\\)\\s-+" . remind-conf-substitutes-face);better date regexp
 	   '("\\s-+\\([12][09][0-9][0-9][-/]\\(0[1-9]\\|1[0-2]\\)[-/]\\([12][0-9]\\|0[1-9]\\|3[01]\\)\\)\\s-+" . remind-time-face) ;; pseudo ISO 8601 date format.
@@ -274,7 +324,7 @@
 	   '("\\s-+\\(\\(?:20\\|19\\)[0-9][0-9]\\)\\s-+" . remind-conf-substitutes-face);years
 	   '("\\s-+\\(2[0-4]\\|[01]?[0-9][.:][0-5][0-9]\\)\\s-+" . remind-conf-substitutes-face);24hour clock, more precise
 	   '("\\s-+\\([+-][+-]?[1-9][0-9]*\\)\\s-+" 1 remind-conf-delta-face prepend)
-	   (cons (regexp-opt remind-builtin-variables 'words) remind-conf-variable-face)))
+           '(remind-builtin-variables-matcher . remind-conf-variable-face)))
  "The ultimate in highlighting experiences for `remind-conf-mode'.")

 ;;YYYY-MM-DD@hh:mm, YYYY-MM-DD@hh.mm, YYYY/MM/DD@hh:mm and YYYY/MM/DD@hh.mm
@@ -462,16 +512,16 @@ Acts on the region or places point where it needs to be."
 ;; finally the derived mode.

 ;;;###autoload
-(define-derived-mode remind-conf-mode text-mode "REM"
+(define-derived-mode remind-conf-mode text-mode "Remind Conf Mode"
  "Major mode for editing remind calendar configuration files.

 \\{remind-conf-mode-map}"
  :syntax-table remind-conf-syntax-table
-  (set (make-local-variable 'font-lock-keywords-case-fold-search) t) ;this is not working atm 2009-04-13
  (set (make-local-variable 'font-lock-defaults) '(remind-conf-font-lock-keywords))
  (set (make-local-variable 'comment-start) ";")
  (set (make-local-variable 'comment-start) "#")
  (set (make-local-variable 'comment-end) "\n")
+  (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\||#\\)")
  (set (make-local-variable 'skeleton-end-hook) nil) ; so the skeletons will not automatically go to a new line.
  (set (make-local-variable 'fill-column) '100);cause I was having problems with autofill.
  (set (make-local-variable 'indent-line-function) 'remind-indent-line)
--- a/docs/README.UNIX
+++ b/docs/README.UNIX
@@ -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,86 +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"
-
-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_dialog .d { Message } $argv warning 0 { OK }
-destroy .
-exit
-------------- Cut Here ---------- Cut Here ---------- Cut Here -------------
-
-
 --
 Dianne Skoll <dianne@skoll.ca>
 https://dianne.skoll.ca/projects/remind/
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
--- a/examples/alignment.rem
+++ b/examples/alignment.rem
@@ -0,0 +1,19 @@
+# Demo the columns() function
+#
+# Run as:  remind -@2 alignment.rem
+# SPDX-License-Identifier: GPL-2.0-only
+
+SET $AddBlankLines 0
+BANNER %
+
+FSET center(x) pad("", " ", (columns() - columns(x))/2) + x
+FSET right(x) pad("", " ", columns() - columns(x)) + x
+
+MSG This is left-aligned.
+MSG [ansicolor(0,255,0)]🌕 🌕 🌕 🌕 This is also left-aligned.[ansicolor("")]
+
+MSG [center("This is centered.")]
+MSG [ansicolor(255,255,0) + center("🌕 🌕 🌕 🌕 This is also centered. ") + ansicolor("")]
+
+msg [right("This is right-aligned.")]
+msg [ansicolor(255,0,0) + right("This is also right-aligned. 🌕 🌕 🌕") + ansicolor("")]
--- a/examples/ansitext
+++ b/examples/ansitext
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# A little demo script that displays ANSI text attributes
+# Not all attributes work on all terminals... your mileage may vary.
+# SPDX-License-Identifier: GPL-2.0-only
+
+remind -@2 - <<'EOF'
+
+SET $AddBlankLines 0
+BANNER %
+INCLUDE [$SysInclude]/ansitext.rem
+MSG This file shows off some ANSI text attributes and colors.
+MSG Not all attributes work on all terminals.%_
+
+MSG This is [ansi_bold]bold.[ansi_normal]
+MSG This is [ansi_faint]faint.[ansi_normal]
+MSG This is [ansi_italic]italic.[ansi_normal]
+MSG This is [ansi_underline]underline.[ansi_normal]
+MSG This is [ansi_underline2]underline2.[ansi_normal]%_
+MSG This is [ansi_reverse]reverse.[ansi_normal]%_
+MSG This is [ansi_strikeout]strikeout.[ansi_normal]%_
+MSG This is [ansi_overline]overline.[ansi_normal]%_
+
+MSG This is [ansicolor(255,0,0)]red.[ansicolor("")]
+MSG This is [ansicolor(0,255,0)]green.[ansicolor("")]
+MSG This is [ansicolor(0,0,255)]blue.[ansicolor("")]
+MSG This is [ansicolor(255,255,0)]yellow.[ansicolor("")]
+MSG This is [ansicolor(255,0,255)]magenta.[ansicolor("")]
+MSG This is [ansicolor(0,255,255)]cyan.[ansicolor("")]
+MSG This is [ansi_bold][ansicolor(255,255,255)][ansicolor(0,0,0,1)]white on black[ansicolor("")][ansi_normal]
+MSG This is [ansi_bold][ansicolor(0,0,0)][ansicolor(255,255,255,1)]black on white[ansicolor("")][ansi_normal]
+MSG %_
+
+# You can combine attributes
+MSG This is [ansicolor(0,255,0)][ansicolor(0,0,96,1)][ansi_italic][ansi_bold]Green-Bold-Italic-on-Blue[ansi_normal][ansicolor("")]
+
+EOF
+
+exit 0
--- a/examples/astro
+++ b/examples/astro
@@ -0,0 +1,124 @@
+#!/bin/sh
+#
+# A little demo script that displays astronomical events
+#
+# Best used in a UTF-8 environment.
+# SPDX-License-Identifier: GPL-2.0-only
+
+# Set your latitude and longitude correctly for Sunrise/Sunset/Equinox/Solstice
+#
+# The values below are for Ottawa, Ontario, Canada
+latitude="45.420556"
+longitude="-75.689722"
+
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+SET $AddBlankLines 0
+BANNER %
+
+INCLUDE [$SysInclude]/ansitext.rem
+
+MSG Today is [ansi_bold][$T][ansi_normal], being the [ord($T-date(year($T),1,1)+1)] day of [year($T)].
+MSG Not including today, the year [year($T)] has [date(year($T)+1, 1, 1)-$T-1] more [plural(date(year($T)+1, 1, 1)-$T-1, "day")] left.%_
+
+IF $TerminalBackground == 0
+   SPECIAL COLOR 255 255 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
+   SPECIAL COLOR 255 128 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+ELSE
+   SPECIAL COLOR 128 128 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
+   SPECIAL COLOR 128 32 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+
+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 %
+IF $TerminalBackground == 0
+   REM [moondatetime(0)] +60 SPECIAL COLOR 255 255 0 New moon:              🌑 [$T] %3 (%b)
+   REM [moondatetime(1)] +60 SPECIAL COLOR 255 255 128 First Quarter:         🌓 [$T] %3 (%b)
+   REM [moondatetime(2)] +60 SPECIAL COLOR 255 255 255 Full moon:             🌕 [$T] %3 (%b)
+   REM [moondatetime(3)] +60 SPECIAL COLOR 255 255 128 Last Quarter:          🌗 [$T] %3 (%b)
+ELSE
+   REM [moondatetime(0)] +60 SPECIAL COLOR 128 128 0 New moon:              🌑 [$T] %3 (%b)
+   REM [moondatetime(1)] +60 SPECIAL COLOR 128 128 64 First Quarter:         🌓 [$T] %3 (%b)
+   REM [moondatetime(2)] +60 SPECIAL COLOR 0 0 0 Full moon:             🌕 [$T] %3 (%b)
+   REM [moondatetime(3)] +60 SPECIAL COLOR 128 128 64 Last Quarter:          🌗 [$T] %3 (%b)
+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 %
+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
+BANNER %
+
+IF $LatDeg >= 0
+   REM [soleq(0)] +366 MSG Next Vernal Equinox:   🌼 [$T] %3 (%b)
+   REM [soleq(1)] +366 MSG Next Summer Solstice:  😎 [$T] %3 (%b)
+   REM [soleq(2)] +366 MSG Next Autumnal Equinox: 🍂 [$T] %3 (%b)
+   REM [soleq(3)] +366 MSG Next Winter Solstice:  ❄️  [$T] %3 (%b)
+ELSE
+   REM [soleq(0)] +366 MSG Next Autumnal Equinox: 🍂 [$T] %3 (%b)
+   REM [soleq(1)] +366 MSG Next Winter Solstice:  ❄️  [$T] %3 (%b)
+   REM [soleq(2)] +366 MSG Next Vernal Equinox:   🌼 [$T] %3 (%b)
+   REM [soleq(3)] +366 MSG Next Summer Solstice:  😎 [$T] %3 (%b)
+ENDIF
+
+EOF
--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -6,6 +6,11 @@
 # Cut and paste as desired!  Also, near the end, there are a bunch of	    #
 # holiday definitions for the U.S.					    #
 # 									    #
+# *** NOTE ***                                                              #
+# 									    #
+# This file is simply a grab-bag of examples.  It is NOT meant to be	    #
+# included as-is in a live reminder file.				    #
+# 									    #
 # Some examples provided by George M. Sipe <gsipe@pyratl.ga.pyramid.com>    #
 # 									    #
 # U.S. holidays provided by Dave Rickel <drickel@sjc.mentorg.com>	    #
@@ -16,7 +21,8 @@
 #  "#PSSTUFF" for nifty PostScript examples				    #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-2018 Dianne Skoll                                      #
+# Copyright (C) 1992-2025 Dianne Skoll                                      #
+# SPDX-License-Identifier: GPL-2.0-only
 # 									    #
 #############################################################################

@@ -25,72 +31,22 @@ RUN OFF
 ################################################
 # Ensure required version of remind is used... #
 ################################################
-IF version() < "03.01.10"
-   ERRMSG This file requires at least version 03.01.10 of Remind.%
+IF version() < "03.04.02"
+   ERRMSG This file requires at least version 03.04.02 of Remind.%
   ERRMSG This version is version [version()].
   EXIT
 ENDIF

-######################################
-# Symbolic constants for weekdays... #
-######################################
-SET Sunday    0
-SET Monday    1
-SET Tuesday   2
-SET Wednesday 3
-SET Thursday  4
-SET Friday    5
-SET Saturday  6
-
-SET Sun 0
-SET Mon 1
-SET Tue 2
-SET Wed 3
-SET Thu 4
-SET Fri 5
-SET Sat 6
-
-#########################################
-# Symbolic constants for month names... #
-#########################################
-
-SET Jan 1
-SET Feb 2
-SET Mar 3
-SET Apr 4
-SET May 5
-SET Jun 6
-SET Jul 7
-SET Aug 8
-SET Sep 9
-SET Oct 10
-SET Nov 11
-SET Dec 12
-
-SET January   1
-SET February  2
-SET March     3
-SET April     4
-SET May       5
-SET June      6
-SET July      7
-SET August    8
-SET September 9
-SET October   10
-SET November  11
-SET December  12
-
 ###########################################################
-# Other symbolic constants and functions for "pasting"... #
+# Symbolic constants and functions for "pasting"...       #
 ###########################################################
 SET Quote CHAR(34)

-# Handy constants/function for specifing week of month...
+# Handy constants/function for specifying week of month...
 SET  Week_1		 1
 SET  Week_2		 8
 SET  Week_3		15
 SET  Week_4		22
-FSET _last(mo)		"1 " + MON((mo%12)+1) + " --7"

 #################################################################
 # Function that removes a single leading zero from a string...  #
@@ -119,50 +75,23 @@ REM 1 MSG John's [_mo_num(11, 1984)] 'monthly' anniversary
 # Here's a tricky problem:  The 4th of July is a holiday in the U.S.
 # However, if it falls on a Saturday, the previous Friday is a holiday.
 # If it falls on a Sunday, the next Monday is a holiday.  Here's how
-# to do it.  NOTE that the following procedure makes the OMIT context
-# dependent upon the current date.  SInce it only depends on the current
-# year, which is not likely to change while producing a calendar, we
-# are fairly safe.  However, reminders with huge DELTA or BACK components
-# may not operate as expected.  In general, any time you make OMIT
-# dependent upon the current date, it's tricky and results may not be
-# what you expect.  You should try to make sure that the OMIT context
-# "near" any current reminders will not change during a calendar run.
-# The SCANFROM clause will make these OMITs safe.
+# to do it.
+#
+# For those reminders that update the OMIT context with ADDOMIT, we use
+# SCANFROM -7 for safety; see the man page about moveable OMITs.
 ############################################################################

-# Calculate the weekday of the holiday.
-REM 4 July SCANFROM -7 SATISFY 1
+# If it falls on a Saturday, bump to previous Friday
+REM 3 JULY SCANFROM -7 ADDOMIT SATISFY [$Tw == 5]  MSG Independence day (observed)

-SET iday $T
-IF WKDAYNUM(iday) == Sat
-	REM [iday] MSG Independence day (actual)
-	OMIT [iday-1] MSG Independence day (observed)
-ELSE
-	IF WKDAYNUM(iday) == Sun
-		REM [iday] MSG Independence day (actual)
-		OMIT [iday+1] MSG Independence day (observed)
-	ELSE
-		OMIT [iday] MSG Independence day
-	ENDIF
-ENDIF
+# If it falls on a Sunday, bump to following Monday
+REM 5 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Independence day (observed)

-############################################################################
-# A meeting on the first Monday of every month which is moved to the       #
-# second Monday in the event of a holiday.                                 #
-############################################################################
+# If it falls on Sat or Sun, note the actual day
+REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual)

-# First, the normal meeting.  However, the SKIP keyword means this
-# one won't be triggered if the first Monday is a holiday
-REM Mon 1 SKIP MSG Meeting
-
-# Now, calculate the "potential" delayed meeting
-REM Mon 8 SATISFY 1
-
-# But only actually trigger the delayed meeting if the previous
-# Monday was a holiday
-IF ISOMITTED($T-7)
-   REM [$T] MSG Delayed meeting
-ENDIF
+# Otherwise observed and actual is on the 4th
+REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw >= 1 && $Tw <= 5] MSG Independence Day

 ##########################################################################
 #								         #
@@ -201,6 +130,8 @@ REM Sat Sun SPECIAL SHADE 220
 # The following holidays were provided by Dave Rickel			    #
 # Modified by D. Skoll to give safe OMITs for moveable holidays		    #
 #									    #
+# NOTE: See include/holidays/us.rem for more up-to-date definitions         #
+#									    #
 #############################################################################

 SET SaveTrig $NumTrig
@@ -216,32 +147,49 @@ REM  [easter+49] MSG %"Pentecost%"
 # which ones are omitted - use the general forms shown below.  You'll
 # need the Week_n variables defined way up in the file.

-OMIT    Jan  1		MSG %"New Year's%" Day
-REM Mon Jan [Week_3]	MSG Martin Luther King - %"MLK Day%"
+OMIT    Jan  1		MSG %"New Year's Day%"
+REM Third Monday in Jan MSG Martin Luther King - %"MLK Day%"
 REM     Feb  2		MSG %"Ground Hog Day%"
-REM     Feb 14		MSG %"Valentine's%" Day
-REM Mon Feb [Week_3]	SCANFROM -7 ADDOMIT MSG %"President's Day%"
-REM     Mar 17		MSG %"St. Patrick's%" Day
+REM     Feb 14		MSG %"Valentine's Day%"
+REM Third Monday in Feb SCANFROM -7 ADDOMIT MSG %"President's Day%"
+REM     Mar 17		MSG %"St. Patrick's Day%"

 # The DST rules are accurate for most locations in
 # North America
 REM Sun Apr 1 ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b
 REM Sun Mar 8 ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST starts%" %b

-REM Sun [_last(Oct)] ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
-REM Sun 1 Nov ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+REM Last Sunday in October ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b
+REM First Sunday in November ++2 FROM 1 Jan 2007 MSG Daylight Saving Time - %"DST ends%" %b

 REM     Apr  1		MSG %"April Fool's%" Day
-REM Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
+
+# US Tax Day
+PUSH-OMIT-CONTEXT
+# Normal case: 16 April falls Mon-Fri
+REM 16 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw >= 1 && $Tw <= 5] MSG Emancipation Day
+
+# 16 April falls on Saturday: Observe on the 15th
+REM 15 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw == 5] MSG Emancipation Day (observed)
+
+# 16 April falls on Sunday: Observe on the 17th
+REM 17 Apr SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Emancipation Day (observed)
+
+# If you live in Maine or Massachussetts, uncomment the next line
+# REM Third Monday in April SCANFROM -7 ADDOMIT MSG Patriots Day
+
+REM Apr 15 OMIT Sat Sun AFTER MSG Tax Day
+POP-OMIT-CONTEXT
+
 REM     May  5		MSG %"Cinco de Mayo%"
-REM Sat May [Week_1]	MSG %"Kentucky Derby%"
-REM Sun May [Week_2]	MSG %"Mother's Day%"
-REM Sat May [Week_3]	MSG %"Armed Forces Day%"
-REM Mon [_last(May)]	SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
+REM First Sat in May 	MSG %"Kentucky Derby%"
+REM Second Sun in May	MSG %"Mother's Day%"
+REM Third Sat in May	MSG %"Armed Forces Day%"
+REM Last Monday in May	SCANFROM -7 ADDOMIT MSG %"Memorial Day%"
 REM     Jun 14		MSG %"Flag Day%"
-REM Sun Jun [Week_3]	MSG %"Father's Day%"
-REM Mon Sep [Week_1]	SCANFROM -7 ADDOMIT MSG %"Labor Day%"
-REM Mon Oct [Week_2]	MSG %"Columbus Day%"
+REM Third Sun in June	MSG %"Father's Day%"
+REM First Mon in Sep	SCANFROM -7 ADDOMIT MSG %"Labor Day%"
+REM Second Mon in Oct	MSG %"Columbus Day%"
 REM     Nov 11		MSG %"Veterans Day%"

 REM     Oct 30		MSG %"Mischief Night%"
@@ -262,6 +210,24 @@ if $NumTrig > SaveTrig
 	REM SPECIAL SHADE 220
 endif

+############################################################################
+# A meeting on the first Monday of every month which is moved to the       #
+# second Monday in the event of a holiday.                                 #
+############################################################################
+
+# First, the normal meeting.  However, the SKIP keyword means this
+# one won't be triggered if the first Monday is a holiday
+REM First Monday SKIP MSG Meeting
+
+# Now, calculate the "potential" delayed meeting
+REM Second Monday SATISFY 1
+
+# But only actually trigger the delayed meeting if the previous
+# Monday was a holiday
+IF ISOMITTED($T-7)
+   REM [$T] MSG Delayed meeting
+ENDIF
+
 #PSSTUFF2
 ##########################################################################
 #									 #
@@ -278,10 +244,10 @@ REM PS Border Border moveto \
   ([hebday($U)] [hebmon($U)]) show

 # Fill in the phases of the moon on the PostScript calendar
-[moondate(0)] SPECIAL MOON 0
-[moondate(1)] SPECIAL MOON 1
-[moondate(2)] SPECIAL MOON 2
-[moondate(3)] SPECIAL MOON 3
+REM [moondate(0)] SPECIAL MOON 0
+REM [moondate(1)] SPECIAL MOON 1
+REM [moondate(2)] SPECIAL MOON 2
+REM [moondate(3)] SPECIAL MOON 3

 # The following example puts sunrise and sunset times in PostScript in the
 # calendar - the sizes are hard-coded, however, and work best in landscape.
@@ -344,51 +310,51 @@ FSET _PastMon(x, y) IIF(WKDAYNUM(_h2(x,y))!=1, _h2(x,y), _h2(x,y)+1)
 SET InIsrael VALUE("InIsrael", 0)
 SET Reform   VALUE("Reform", 0)

-[_h(1,  "Tishrey")] ++4 MSG %"Rosh Hashana 1%" is %b.
+REM [_h(1,  "Tishrey")] ++4 MSG %"Rosh Hashana 1%" is %b.

 # No RH-2 or Tzom Gedalia in Reform
 IF !Reform
-   [_h(2,  "Tishrey")] ++4 MSG %"Rosh Hashana 2%" is %b.
-   [_PastSat(3,  "Tishrey")] ++4 MSG %"Tzom Gedalia%" is %b.
+   REM [_h(2,  "Tishrey")] ++4 MSG %"Rosh Hashana 2%" is %b.
+   REM [_PastSat(3,  "Tishrey")] ++4 MSG %"Tzom Gedalia%" is %b.
 ENDIF

-[_h(10, "Tishrey")] ++4 MSG %"Yom Kippur%" is %b.
-[_h(15, "Tishrey")] ++4 MSG %"Sukkot 1%" is %b.
+REM [_h(10, "Tishrey")] ++4 MSG %"Yom Kippur%" is %b.
+REM [_h(15, "Tishrey")] ++4 MSG %"Sukkot 1%" is %b.

 IF !InIsrael
-   [_h(16, "Tishrey")] MSG %"Sukkot 2%"
+   REM [_h(16, "Tishrey")] MSG %"Sukkot 2%"
 ENDIF

-[_h(21, "Tishrey")] ++4 MSG %"Hoshana Rabba%" is %b.
-[_h(22, "Tishrey")] ++4 MSG %"Shemini Atzeret%" is %b.
+REM [_h(21, "Tishrey")] ++4 MSG %"Hoshana Rabba%" is %b.
+REM [_h(22, "Tishrey")] ++4 MSG %"Shemini Atzeret%" is %b.

 IF InIsrael
-   [_h(22, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
+   REM [_h(22, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
 ELSE
-   [_h(23, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
+   REM [_h(23, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
 ENDIF

 # Because Kislev can change length, we must be more careful about Chanukah
 FSET _chan(x) HEBDATE(24, "Kislev", $U-9)+x
-[_chan(1)] ++4 MSG %"Chanukah 1%" is %b.
-[_chan(2)] MSG %"Chanukah 2%"
-[_chan(3)] MSG %"Chanukah 3%"
-[_chan(4)] MSG %"Chanukah 4%"
-[_chan(5)] MSG %"Chanukah 5%"
-[_chan(6)] MSG %"Chanukah 6%"
-[_chan(7)] MSG %"Chanukah 7%"
-[_chan(8)] MSG %"Chanukah 8%"
+REM [_chan(1)] ++4 MSG %"Chanukah 1%" is %b.
+REM [_chan(2)] MSG %"Chanukah 2%"
+REM [_chan(3)] MSG %"Chanukah 3%"
+REM [_chan(4)] MSG %"Chanukah 4%"
+REM [_chan(5)] MSG %"Chanukah 5%"
+REM [_chan(6)] MSG %"Chanukah 6%"
+REM [_chan(7)] MSG %"Chanukah 7%"
+REM [_chan(8)] MSG %"Chanukah 8%"

 # Not sure about Reform's position on the next one.
 IF !Reform
 # 10 Tevet will never be a Saturday, so whether or not to
 # move it is moot.  (Thanks to Art Werschulz.)
-   [_h(10, "Tevet")] MSG %"Tzom Tevet%" is %b.
+   REM [_h(10, "Tevet")] MSG %"Tzom Tevet%" is %b.
 ENDIF

-[_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b.
-[_h(14, "Adar A")] ++4 MSG %"Purim Katan%" is %b.
-[_h(15, "Adar A")] ++4 MSG %"Shushan Purim Katan%" is %b.
+REM [_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b.
+REM [_h(14, "Adar A")] ++4 MSG %"Purim Katan%" is %b.
+REM [_h(15, "Adar A")] ++4 MSG %"Shushan Purim Katan%" is %b.

 # If Purim is on Sunday, then Fast of Esther is 11 Adar.
 IF WKDAYNUM(_h2(13, "Adar")) != 6
@@ -396,18 +362,18 @@ IF WKDAYNUM(_h2(13, "Adar")) != 6
 ELSE
   REM [_h2(11, "Adar")] ++4 MSG %"Fast of Esther%" is %b.
 ENDIF
-[_h(14, "Adar")] ++4 MSG %"Purim%" is %b.
-[_h(15, "Adar")] ++4 MSG %"Shushan Purim%" is %b.
-[_h(15, "Nisan")] ++4 MSG %"Pesach%" is %b.
+REM [_h(14, "Adar")] ++4 MSG %"Purim%" is %b.
+REM [_h(15, "Adar")] ++4 MSG %"Shushan Purim%" is %b.
+REM [_h(15, "Nisan")] ++4 MSG %"Pesach%" is %b.

 IF !InIsrael
-   [_h(16, "Nisan")] MSG %"Pesach 2%"
+   REM [_h(16, "Nisan")] MSG %"Pesach 2%"
 ENDIF

-[_h(21, "Nisan")] MSG %"Pesach 7%"
+REM [_h(21, "Nisan")] MSG %"Pesach 7%"

 IF !InIsrael && !Reform
-   [_h(22, "Nisan")] MSG %"Pesach 8%"
+   REM [_h(22, "Nisan")] MSG %"Pesach 8%"
 ENDIF

 REM [_PastSun(27, "Nisan")] SATISFY 1
@@ -423,36 +389,36 @@ ENDIF
 # Thursday.  If 4 Iyar is a Sunday, then Yom Hazikaron
 # moves to 5 Iyar and Yom Ha'atzmaut to 6 Iyar.
 IF WKDAYNUM(_h2(4, "Iyar")) == 4 || WKDAYNUM(_h2(4, "Iyar")) == 5
-	[_h(2, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
-	[_h(3, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
+   REM [_h(2, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
+   REM [_h(3, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
 ELSE
 IF WKDAYNUM(_h2(4, "Iyar")) == 0
-	[_h(5, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
-	[_h(6, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
+   REM [_h(5, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
+   REM [_h(6, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
 ELSE
-	[_h(4, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
-	[_h(5, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
+   REM [_h(4, "Iyar")] ++4 MSG %"Yom Hazikaron%" is %b.
+   REM [_h(5, "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
 ENDIF
 ENDIF

 # Not sure about Reform's position on Lag B'Omer
 IF !Reform
-   [_h(18, "Iyar")] ++4 MSG %"Lag B'Omer%" is %b.
+   REM [_h(18, "Iyar")] ++4 MSG %"Lag B'Omer%" is %b.
 ENDIF

-[_h(28, "Iyar")] ++4 MSG %"Yom Yerushalayim%" is %b.
-[_h(6,  "Sivan")] ++4 MSG %"Shavuot%" is %b.
+REM [_h(28, "Iyar")] ++4 MSG %"Yom Yerushalayim%" is %b.
+REM [_h(6,  "Sivan")] ++4 MSG %"Shavuot%" is %b.

 IF !InIsrael && !Reform
-   [_h(7, "Sivan")] MSG %"Shavuot 2%"
+   REM [_h(7, "Sivan")] MSG %"Shavuot 2%"
 ENDIF

 # Fairly sure Reform Jews don't observe the next two
 IF !Reform
 # Tzom Tamuz and Tish'a B'Av are moved to Sunday if they normally
 # fall on a Saturday
-   [_PastSat(17, "Tamuz")] ++4 MSG %"Tzom Tammuz%" is %b.
-   [_PastSat(9,  "Av")] ++4 MSG %"Tish'a B'Av%" is %b.
+   REM [_PastSat(17, "Tamuz")] ++4 MSG %"Tzom Tammuz%" is %b.
+   REM [_PastSat(9,  "Av")] ++4 MSG %"Tish'a B'Av%" is %b.
 ENDIF

 # Counting the omer - do the whole spiel, i.e:
--- a/examples/remind.vim
+++ b/examples/remind.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Remind
-" Maintainer:	Davide Alberani <alberanid@libero.it>
-" Last Change:	18 Sep 2009
-" Version:	0.5
-" URL:		http://erlug.linux.it/~da/vim/syntax/remind.vim
+" Maintainer:	Davide Alberani <da@erlug.linux.it>
+" Last Change:	02 Nov 2015 + 13 Mar 2022 by Dianne Skoll <dianne@skoll.ca>
+" Version:	0.7+dianne1
+" URL:		http://ismito.it/vim/syntax/remind.vim
 "
 " remind is a sophisticated reminder service
 " you can download remind from:
@@ -23,7 +23,7 @@ syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED THROUGH
 syn keyword remindTag		PRIORITY TAG
 syn keyword remindTimed		AT DURATION
 syn keyword remindMove		ONCE SKIP BEFORE AFTER
-syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR COLOUR
+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR COLOUR DO
 syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
 syn keyword remindConditional	IF ELSE ENDIF IFTRIG
 syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE
--- a/include/ansitext.rem
+++ b/include/ansitext.rem
@@ -0,0 +1,35 @@
+# Global variables for various ANSI escape-code sequences
+# Not all sequences are supported by all terminals.
+
+# This file is part of REMIND
+# REMIND is Copyright (C) 1992-2025 by Dianne Skoll
+# SPDX-License-Identifier: GPL-2.0-only
+
+if !defined("ansi_bold")
+    # Disable ANSI attributes in calandar mode
+    if $CalMode
+        set ansi_normal     ""
+        set ansi_bold       ""
+        set ansi_faint      ""
+        set ansi_italic     ""
+        set ansi_underline  ""
+        set ansi_reverse    ""
+        set ansi_strikeout  ""
+        set ansi_underline2 ""
+        set ansi_overline   ""
+    else
+        set ansi_normal     char(27) + "[0m"
+        set ansi_bold       char(27) + "[1m"
+        set ansi_faint      char(27) + "[2m"
+        set ansi_italic     char(27) + "[3m"
+        set ansi_underline  char(27) + "[4m"
+        set ansi_reverse    char(27) + "[7m"
+        set ansi_strikeout  char(27) + "[9m"
+        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
+endif
+
+# Example: REM MSG I must [ansi_bold]emphasize[ansi_normal] \
+#              the [ansi_italic]severity[ansi_normal] of the situation!
--- a/include/holidays/README
+++ b/include/holidays/README
@@ -0,0 +1,62 @@
+This directory contains holiday files.  The two-character files contain
+holidays for various countries.  Some countries (such as US and CA) have
+regions with their own different holidays; the regional holidays are
+stored in *.rem files underneath the country-code directory (eg, us and ca,
+respectively.)
+
+Many of these files were generated from the excellent "holidays" Python
+library at https://pypi.org/project/holidays/
+
+I did great damage to the library and host a terrible, awful hacked version
+at https://github.com/dfskoll/holidays; it is this repo (in the remind-output
+branch) that I used to generate the Remind files.
+
+********************** IMPORTANT CAVEATS **********************
+
+Any holidays that depend on a non-Gregorian calendar such as Jewish,
+Islamic, Chinese and other East Asian calendars will NOT appear in the
+country files!  The only exceptions are holidays depending on the
+Orthodox Easter date, for which Remind has support.
+
+Also, I have made no effort to track changes to holiday legislation
+over time.  Therefore, the holiday files may be inaccurate for years
+prior to 2024.  I also did not include any one-off holidays such as
+the funeral of Queen Elizabeth on 19 September 2022.
+
+Non-country holiday files are:
+
+chinese-new-year.rem - Chinese New Year from 2022 through 2050
+discordian.rem       - Discordian holidays
+jewish.rem           - Jewish holidays
+pagan.rem            - Pagan holidays
+
+ADVANCE WARNING:
+================
+
+None of the included holiday files have deltas or substitution sequences.
+You can use the following trick if you would like (for example) 7 days'
+advance warning of holidays:
+
+    # Save old definition (if any) of msgsuffix
+    FRENAME msgsuffix saved_msgsuffix
+
+    # Save old value of $DefaultDelta
+    SET old_delta $DefaultDelta
+
+    # We want 7 days' advance warning
+    SET $DefaultDelta 7
+
+    # Add a suffix to print " is in xxx days", etc.
+    # Note the char(8) at the start to put the suffix
+    # on the same line as the reminder, and the final %
+    # in the argument of dosubst() to avoid an *extra*
+    # newline from being added
+    FSET msgsuffix(x) char(8) + dosubst(" is %b.%", $T)
+
+    # Include your holiday files here...
+    SYSINCLUDE holidays/us.rem
+    SYSINCLUDE holidays/us/ny.rem
+
+    # Restore old version of msgsuffix and $DefaultDelta
+    FRENAME saved_msgsuffix msgsuffix
+    SET $DefaultDelta old_delta
--- a/include/holidays/ad.rem
+++ b/include/holidays/ad.rem
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Andorra
+# 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]/holidays/ad/
+
+OMIT 1 January MSG New Year's Day
+OMIT 6 January MSG Epiphany
+OMIT [easterdate($Uy)-47] MSG Carnival
+OMIT 14 March MSG Constitution Day
+OMIT [easterdate($Uy)-2] MSG Good Friday
+OMIT [easterdate($Uy)+1] MSG Easter Monday
+OMIT 1 May MSG Labor Day
+OMIT [easterdate($Uy)+50] MSG Whit Monday
+OMIT 15 August MSG Assumption Day
+OMIT 8 September MSG National Day
+OMIT 1 November MSG All Saints' Day
+OMIT 8 December MSG Immaculate Conception Day
+OMIT 25 December MSG Christmas Day
+OMIT 26 December MSG Saint Stephen's Day
--- a/include/holidays/ad/02.rem
+++ b/include/holidays/ad/02.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 02 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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
+REM Monday 17 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
--- a/include/holidays/ad/03.rem
+++ b/include/holidays/ad/03.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 03 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/ad.rem
+
+OMIT 15 August MSG Encamp Annual Festival
+OMIT 16 August MSG Encamp Annual Festival
--- a/include/holidays/ad/04.rem
+++ b/include/holidays/ad/04.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 04 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/ad.rem
+
+OMIT 15 August MSG La Massana Annual Festival
+OMIT 16 August MSG La Massana Annual Festival
--- a/include/holidays/ad/05.rem
+++ b/include/holidays/ad/05.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 05 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/ad.rem
+
+OMIT 15 August MSG Ordino Annual Festival
+OMIT 16 August MSG Ordino Annual Festival
--- a/include/holidays/ad/06.rem
+++ b/include/holidays/ad/06.rem
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 06 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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
+REM Sunday 25 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
+REM Monday 26 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
--- a/include/holidays/ad/07.rem
+++ b/include/holidays/ad/07.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 07 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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
+REM Monday 3 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
--- a/include/holidays/ad/08.rem
+++ b/include/holidays/ad/08.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 08 in Andorra
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/ad.rem
+
+OMIT 25 July MSG Escaldes-Engordany Annual Festival
+OMIT 26 July MSG Escaldes-Engordany Annual Festival
--- a/include/holidays/ae.rem
+++ b/include/holidays/ae.rem
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: MIT
+# 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 اليوم الوطني
+OMIT 3 December MSG اليوم الوطني
--- a/include/holidays/al.rem
+++ b/include/holidays/al.rem
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+# 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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
+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ë)
--- a/include/holidays/am.rem
+++ b/include/holidays/am.rem
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: MIT
+# 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 Նոր տարվա օր
+OMIT 6 January MSG Սուրբ Ծնունդ եւ Հայտնություն
+OMIT 28 January MSG Բանակի օր
+OMIT 8 March MSG Կանանց տոն
+OMIT 24 April MSG Եղեռնի զոհերի հիշատակի օր
+OMIT 1 May MSG Աշխատանքի օր
+OMIT 9 May MSG Հաղթանակի և Խաղաղության տոն
+OMIT 28 May MSG Հանրապետության օր
+OMIT 5 July MSG Սահմանադրության օր
+OMIT 21 September MSG Անկախության օր
+OMIT 31 December MSG Նոր տարվա գիշեր
--- a/include/holidays/ao.rem
+++ b/include/holidays/ao.rem
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: MIT
+# 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 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 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 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 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 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 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 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 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 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 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 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 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)
--- a/include/holidays/ar.rem
+++ b/include/holidays/ar.rem
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: MIT
+# 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
+OMIT [easterdate($Uy)-47] MSG Día de Carnaval
+OMIT 24 March MSG Día Nacional de la Memoria por la Verdad y la Justicia
+OMIT 2 April MSG Día del Veterano y de los Caidos en la Guerra de Malvinas
+OMIT [easterdate($Uy)-2] MSG Viernes Santo
+OMIT 1 May MSG Día del Trabajo
+OMIT 25 May MSG Día de la Revolución de Mayo
+REM 15 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 16 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 17 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+OMIT 20 June MSG Paso a la Inmortalidad del General Don Manuel Belgrano
+REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+OMIT 9 July MSG Día de la Independencia
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 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
--- a/include/holidays/as.rem
+++ b/include/holidays/as.rem
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: MIT
+# 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 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 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 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 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 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 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 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
--- a/include/holidays/at.rem
+++ b/include/holidays/at.rem
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Austria
+# 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]/holidays/at/
+
+OMIT 1 January MSG Neujahr
+OMIT 6 January MSG Heilige Drei Könige
+OMIT [easterdate($Uy)+1] MSG Ostermontag
+OMIT 1 May MSG Staatsfeiertag
+OMIT [easterdate($Uy)+39] MSG Christi Himmelfahrt
+OMIT [easterdate($Uy)+50] MSG Pfingstmontag
+OMIT [easterdate($Uy)+60] MSG Fronleichnam
+OMIT 15 August MSG Mariä Himmelfahrt
+OMIT 26 October MSG Nationalfeiertag
+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
--- a/include/holidays/at/1.rem
+++ b/include/holidays/at/1.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 1 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 11 November MSG Hl. Martin
--- a/include/holidays/at/2.rem
+++ b/include/holidays/at/2.rem
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 2 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 19 March MSG Hl. Josef
+REM 10 October MSG Tag der Volksabstimmung
--- a/include/holidays/at/3.rem
+++ b/include/holidays/at/3.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 3 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 15 November MSG Hl. Leopold
--- a/include/holidays/at/4.rem
+++ b/include/holidays/at/4.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 4 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 4 May MSG Hl. Florian
--- a/include/holidays/at/5.rem
+++ b/include/holidays/at/5.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 5 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 24 September MSG Hl. Rupert
--- a/include/holidays/at/6.rem
+++ b/include/holidays/at/6.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 6 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 19 March MSG Hl. Josef
--- a/include/holidays/at/7.rem
+++ b/include/holidays/at/7.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 7 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 19 March MSG Hl. Josef
--- a/include/holidays/at/8.rem
+++ b/include/holidays/at/8.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 8 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 19 March MSG Hl. Josef
--- a/include/holidays/at/9.rem
+++ b/include/holidays/at/9.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision 9 in Austria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/at.rem
+
+
+# Optional holidays
+REM 15 November MSG Hl. Leopold
--- a/include/holidays/au.rem
+++ b/include/holidays/au.rem
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Australia
+# 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]/holidays/au/
+
+OMIT 1 January MSG New Year's Day
+OMIT 26 January MSG Australia Day
+OMIT [easterdate($Uy)-2] MSG Good Friday
+OMIT [easterdate($Uy)+1] MSG Easter Monday
+OMIT 25 April MSG ANZAC Day
+OMIT 25 December MSG Christmas Day
+OMIT 26 December MSG Boxing Day
--- a/include/holidays/au/act.rem
+++ b/include/holidays/au/act.rem
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision ACT in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/au.rem
+
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Canberra Day
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM Monday 27 May ADDOMIT SCANFROM -28 MSG Reconciliation Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
+REM First Monday in August SCANFROM -28 MSG Bank Holiday
--- a/include/holidays/au/nsw.rem
+++ b/include/holidays/au/nsw.rem
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision NSW in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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)
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
+REM First Monday in August SCANFROM -28 MSG Bank Holiday
--- a/include/holidays/au/nt.rem
+++ b/include/holidays/au/nt.rem
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision NT in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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)
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Picnic Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+
+# Optional holidays
+REM 24 December MSG Christmas Eve (from 7pm)
+REM 31 December MSG New Year's Eve (from 7pm)
--- a/include/holidays/au/qld.rem
+++ b/include/holidays/au/qld.rem
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision QLD in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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)
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
+REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG The Royal Queensland Show
+REM First Monday in October ADDOMIT SCANFROM -28 MSG King's Birthday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
--- a/include/holidays/au/sa.rem
+++ b/include/holidays/au/sa.rem
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision SA in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/au.rem
+
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Adelaide Cup Day
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+OMIT 26 December MSG Proclamation Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+
+# Optional holidays
+REM 24 December MSG Christmas Eve (from 7pm)
+REM 31 December MSG New Year's Eve (from 7pm)
--- a/include/holidays/au/tas.rem
+++ b/include/holidays/au/tas.rem
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision TAS in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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
+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)
--- a/include/holidays/au/vic.rem
+++ b/include/holidays/au/vic.rem
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision VIC in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/au.rem
+
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
+OMIT [easterdate($Uy)-1] MSG Easter Saturday
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG Grand Final Day
+REM First Tuesday in November ADDOMIT SCANFROM -28 MSG Melbourne Cup Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
--- a/include/holidays/au/wa.rem
+++ b/include/holidays/au/wa.rem
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision WA in Australia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/au.rem
+
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
+OMIT [easterdate($Uy)] MSG Easter Sunday
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
+REM 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)
--- a/include/holidays/aw.rem
+++ b/include/holidays/aw.rem
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: MIT
+# 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
+OMIT [easterdate($Uy)-48] MSG Dialuna prome cu diaranson di shinish
+OMIT 18 March MSG Dia di Himno y Bandera
+OMIT [easterdate($Uy)-2] MSG Bierna Santo
+OMIT [easterdate($Uy)+1] MSG Di dos dia di Pasco di Resureccion
+OMIT 1 May MSG Dia di Obrero
+OMIT [easterdate($Uy)+39] MSG Dia di Asuncion
+REM 31 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Dia di Rey
+REM 1 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Dia di Rey
+OMIT 25 December MSG Pasco di Nacemento
+OMIT 26 December MSG Di dos dia di Pasco di Nacemento
--- a/include/holidays/az.rem
+++ b/include/holidays/az.rem
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: MIT
+# 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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+OMIT 9 November MSG Azərbaycan Respublikasının Dövlət bayrağı günü
+REM 9 November OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 9))==0 || wkdaynum(date($Ty, 11, 9))==6] MSG Azərbaycan Respublikasının Dövlət bayrağı günü (müşahidə olunur)
+OMIT 31 December MSG Dünya azərbaycanlılarının həmrəyliyi günü
+REM 31 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31))==0 || wkdaynum(date($Ty, 12, 31))==6] MSG Dünya azərbaycanlılarının həmrəyliyi günü (müşahidə olunur)
+
+# Optional holidays
+REM 27 September MSG Anım Günü
+REM 18 October MSG Müstəqilliyin Bərpası Günü
+REM 12 November MSG Konstitusiya Günü
+REM 17 November MSG Milli Dirçəliş Günü
--- a/include/holidays/ba.rem
+++ b/include/holidays/ba.rem
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: MIT
+# 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 Bosnia And Herzegovina.
+#
+# For region-specific holidays, you need to include
+# one of the regional *.rem files in the directory
+# [$SysInclude]/holidays/ba/
+
+OMIT 1 January MSG Nova godina
+OMIT 2 January MSG Nova godina
+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)
--- a/include/holidays/ba/bih.rem
+++ b/include/holidays/ba/bih.rem
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+# 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]/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)
+OMIT 1 March MSG Dan nezavisnosti
+OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
+OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
+OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
+OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+OMIT 9 May MSG Dan pobjede nad fašizmom
+OMIT 25 November MSG Dan državnosti
+OMIT 24 December MSG Badnji dan (Katolički)
--- a/include/holidays/ba/brc.rem
+++ b/include/holidays/ba/brc.rem
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: MIT
+# 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]/holidays/ba.rem
+
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
+OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
--- a/include/holidays/ba/srp.rem
+++ b/include/holidays/ba/srp.rem
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: MIT
+# 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]/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)
+OMIT 14 January MSG Pravoslavna Nova godina
+OMIT [orthodoxeaster($Uy)-2] MSG Veliki petak (Katolički)
+OMIT [orthodoxeaster($Uy)] MSG Uskrs (Katolički)
+OMIT [orthodoxeaster($Uy)] MSG Vaskrs (Pravoslavni)
+OMIT [orthodoxeaster($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+OMIT 9 May MSG Dan pobjede nad fašizmom
+OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini
+OMIT 24 December MSG Badnji dan (Katolički)
--- a/include/holidays/bb.rem
+++ b/include/holidays/bb.rem
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: MIT
+# 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 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 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
+OMIT 1 May MSG May Day
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+OMIT [easterdate($Uy)+50] MSG Whit Monday
+OMIT 1 August MSG Emancipation Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Kadooment Day
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
+REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+OMIT 30 November MSG Independence Day
+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 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)
--- a/include/holidays/bd.rem
+++ b/include/holidays/bd.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# 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
+OMIT 26 March MSG Independence Day
+OMIT 14 April MSG Bengali New Year's Day
+OMIT 1 May MSG May Day
+OMIT 15 August MSG National Mourning Day
+OMIT 16 December MSG Victory Day
--- a/include/holidays/be.rem
+++ b/include/holidays/be.rem
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: MIT
+# 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
+OMIT [easterdate($Uy)+1] MSG Paasmaandag
+OMIT 1 May MSG Dag van de Arbeid
+OMIT [easterdate($Uy)+39] MSG O. L. H. Hemelvaart
+OMIT [easterdate($Uy)+49] MSG Pinksteren
+OMIT [easterdate($Uy)+50] MSG Pinkstermaandag
+OMIT 21 July MSG Nationale feestdag
+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
--- a/include/holidays/bf.rem
+++ b/include/holidays/bf.rem
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: MIT
+# 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 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 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 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 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
+OMIT 15 August MSG Assumption Day
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+OMIT 31 October MSG Martyrs' Day
+OMIT 1 November MSG All Saints' Day
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+OMIT 11 December MSG Proclamation of Independence Day
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
+OMIT 25 December MSG Christmas Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
--- a/include/holidays/bg.rem
+++ b/include/holidays/bg.rem
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Bulgaria
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# See important caveats in the README file in this directory.
+
+OMIT 1 January MSG Нова година
+REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Нова година (почивен ден)
+OMIT 3 March MSG Ден на Освобождението на България от османско иго
+REM 3 March OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3))==0 || wkdaynum(date($Ty, 3, 3))==6] MSG Ден на Освобождението на България от османско иго (почивен ден)
+OMIT [orthodoxeaster($Uy)-2] MSG Велики петък
+OMIT [orthodoxeaster($Uy)-1] MSG Велика събота
+OMIT [orthodoxeaster($Uy)] MSG Великден
+OMIT [orthodoxeaster($Uy)+1] MSG Великден
+OMIT 1 May MSG Ден на труда и на международната работническа солидарност
+REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Ден на труда и на международната работническа солидарност (почивен ден)
+OMIT 6 May MSG Гергьовден, Ден на храбростта и Българската армия
+REM 6 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 6))==0 || wkdaynum(date($Ty, 5, 6))==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 Ден на светите братя Кирил и Методий, на българската азбука, просвета и култура и на славянската книжовност (почивен ден)
+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 Ден на Съединението (почивен ден)
+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 Ден на Независимостта на България (почивен ден)
+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 Бъдни вечер (почивен ден)
+OMIT 25 December MSG Рождество Христово
+REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Рождество Христово (почивен ден)
+OMIT 26 December MSG Рождество Христово
+REM 26 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26))==0 || wkdaynum(date($Ty, 12, 26))==6] MSG Рождество Христово (почивен ден)
+
+# Optional holidays
+REM 1 November MSG Ден на народните будители
--- a/include/holidays/bh.rem
+++ b/include/holidays/bh.rem
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+# 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 عيد العمال
+OMIT 16 December MSG اليوم الوطني
+OMIT 17 December MSG اليوم الوطني
--- a/include/holidays/bi.rem
+++ b/include/holidays/bi.rem
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: MIT
+# 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 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
+OMIT 6 April MSG President Ntaryamira Day
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
+OMIT 1 May MSG Labour Day
+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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
+OMIT 1 July MSG Independence Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
+OMIT 15 August MSG Assumption Day
+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 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 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+OMIT 25 December MSG Christmas Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
--- a/include/holidays/bn.rem
+++ b/include/holidays/bn.rem
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: MIT
+# 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 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 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 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 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 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)
--- a/include/holidays/bo.rem
+++ b/include/holidays/bo.rem
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Bolivia
+# 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]/holidays/bo/
+
+OMIT 1 January MSG Año Nuevo
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+OMIT 22 January MSG Día de la Creación del Estado Plurinacional de Bolivia
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
+OMIT [easterdate($Uy)-48] MSG Carnaval
+OMIT [easterdate($Uy)-47] MSG Carnaval
+OMIT [easterdate($Uy)-2] MSG Viernes Santo
+OMIT 1 May MSG Día del Trabajo
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+OMIT [easterdate($Uy)+60] MSG Corpus Christi
+OMIT 21 June MSG Año Nuevo Aymara Amazónico
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
+OMIT 6 August MSG Día de la Independencia de Bolivia
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
+OMIT 17 October MSG Día de la Dignidad Nacional
+OMIT 2 November MSG Día de Todos los Difuntos
+OMIT 25 December MSG Navidad
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
--- a/include/holidays/bo/b.rem
+++ b/include/holidays/bo/b.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision B in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 18 November MSG Día del departamento de Beni
--- a/include/holidays/bo/c.rem
+++ b/include/holidays/bo/c.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision C in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 14 September MSG Día del departamento de Cochabamba
--- a/include/holidays/bo/h.rem
+++ b/include/holidays/bo/h.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision H in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 25 May MSG Día del departamento de Chuquisaca
--- a/include/holidays/bo/l.rem
+++ b/include/holidays/bo/l.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision L in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 16 July MSG Día del departamento de La Paz
--- a/include/holidays/bo/n.rem
+++ b/include/holidays/bo/n.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision N in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 11 October MSG Día del departamento de Pando
--- a/include/holidays/bo/o.rem
+++ b/include/holidays/bo/o.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision O in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro
--- a/include/holidays/bo/p.rem
+++ b/include/holidays/bo/p.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision P in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 10 November MSG Día del departamento de Potosí
--- a/include/holidays/bo/s.rem
+++ b/include/holidays/bo/s.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision S in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 24 September MSG Día del departamento de Santa Cruz
--- a/include/holidays/bo/t.rem
+++ b/include/holidays/bo/t.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision T in Bolivia
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/bo.rem
+
+OMIT 15 April MSG La Tablada
--- a/include/holidays/br.rem
+++ b/include/holidays/br.rem
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for Brazil
+# 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]/holidays/br/
+
+OMIT 1 January MSG Confraternização Universal
+OMIT [easterdate($Uy)-2] MSG Sexta-feira Santa
+OMIT 21 April MSG Tiradentes
+OMIT 1 May MSG Dia do Trabalhador
+OMIT 7 September MSG Independência do Brasil
+OMIT 12 October MSG Nossa Senhora Aparecida
+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
+REM [easterdate($Uy)+60] MSG Corpus Christi
+REM 28 October MSG Dia do Servidor Público
+REM 24 December MSG Véspera de Natal
+REM 31 December MSG Véspera de Ano-Novo
--- a/include/holidays/br/ac.rem
+++ b/include/holidays/br/ac.rem
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision AC in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/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
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia Internacional da Mulher
+REM Friday 8 March ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 3, 8)) >= 2 && wkdaynum(date($Ty, 3, 8)) <= 4] MSG Dia Internacional da Mulher
+OMIT 15 June MSG Aniversário do Acre
+REM 23 September ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia da Amazônia
+REM Friday 23 September ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 9, 23)) >= 2 && wkdaynum(date($Ty, 9, 23)) <= 4] MSG Dia da Amazônia
+REM 17 November ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Assinatura do Tratado de Petrópolis
+REM Friday 17 November ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 11, 17)) >= 2 && wkdaynum(date($Ty, 11, 17)) <= 4] MSG Assinatura do Tratado de Petrópolis
--- a/include/holidays/br/al.rem
+++ b/include/holidays/br/al.rem
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision AL in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 24 June MSG São João
+OMIT 29 June MSG São Pedro
+OMIT 16 September MSG Emancipação Política de Alagoas
+OMIT 30 November MSG Dia do Evangélico
--- a/include/holidays/br/am.rem
+++ b/include/holidays/br/am.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision AM in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 5 September MSG Elevação do Amazonas à categoria de província
--- a/include/holidays/br/ap.rem
+++ b/include/holidays/br/ap.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision AP in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 19 March MSG São José
+OMIT 25 July MSG São Tiago
+OMIT 13 September MSG Criação do Território Federal
--- a/include/holidays/br/ba.rem
+++ b/include/holidays/br/ba.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision BA in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 2 July MSG Independência da Bahia
--- a/include/holidays/br/ce.rem
+++ b/include/holidays/br/ce.rem
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision CE in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 19 March MSG São José
+OMIT 25 March MSG Abolição da escravidão no Ceará
+OMIT 15 August MSG Nossa Senhora da Assunção
--- a/include/holidays/br/df.rem
+++ b/include/holidays/br/df.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision DF in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 21 April MSG Fundação de Brasília
+OMIT 30 November MSG Dia do Evangélico
--- a/include/holidays/br/es.rem
+++ b/include/holidays/br/es.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision ES in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT [easterdate($Uy)+8] MSG Nossa Senhora da Penha
--- a/include/holidays/br/go.rem
+++ b/include/holidays/br/go.rem
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision GO in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 26 July MSG Fundação da cidade de Goiás
+OMIT 24 October MSG Pedra fundamental de Goiânia
--- a/include/holidays/br/ma.rem
+++ b/include/holidays/br/ma.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision MA in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 28 July MSG Adesão do Maranhão à independência do Brasil
--- a/include/holidays/br/mg.rem
+++ b/include/holidays/br/mg.rem
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: MIT
+# Holiday file for subdivision MG in Brazil
+# Derived from the Python holidays project at
+# https://github.com/vacanza/holidays
+#
+# 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]/holidays/br.rem
+
+OMIT 21 April MSG Execução de Tiradentes
--- a/Show More
+++ b/Show More