Prepare for 05.02.01 release.

Fix incorrect comparison code.
Remove const qualifier.
2026-04-16 14:28:40 +02:00 · 2024-12-16 19:37:31 -05:00 · 2024-12-16 19:33:41 -05:00 · 2024-12-16 17:10:45 -05:00 · 2024-12-16 09:31:02 -05:00 · 2024-12-14 11:52:16 -05:00
491 changed files with 939336 additions and 5477 deletions
--- a/build.tk
+++ b/build.tk
@@ -40,7 +40,6 @@ proc SetConfigDefaults {} {
    set Config(TIMESEP) ":"
    set Config(NORTHERN_HEMISPHERE) 1
    set Config(WESTERN_HEMISPHERE) 1
-    set Config(LANGUAGE) "English"
    set Config(INST_DIR) "/usr/local/bin"
    set Config(MAN_DIR) "/usr/local/share/man"
 }
@@ -242,32 +241,6 @@ proc CreateOptionsDialog { w } {

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

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

@@ -786,7 +743,6 @@ proc SetConfigFromRemind {} {
    QueryRemind $rem LOCATION {$Location}
    QueryRemind $rem DATESEP {$DateSep}
    QueryRemind $rem TIMESEP {$TimeSep}
-    QueryRemind $rem LANGUAGE {language()}

    set $Config(LAT_MIN) [expr abs($Config(LAT_MIN))]
    set $Config(LAT_SEC) [expr abs($Config(LAT_SEC))]
--- a/18
+++ b/18
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for remind 05.01.00.
+# Generated by GNU Autoconf 2.71 for remind 05.02.01.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='05.01.00'
-PACKAGE_STRING='remind 05.01.00'
+PACKAGE_VERSION='05.02.01'
+PACKAGE_STRING='remind 05.02.01'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'

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

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

@@ -1327,7 +1327,7 @@ fi

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

@@ -1415,7 +1415,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-remind configure 05.01.00
+remind configure 05.02.01
 generated by GNU Autoconf 2.71

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

-It was created by remind $as_me 05.01.00, which was
+It was created by remind $as_me 05.02.01, which was
 generated by GNU Autoconf 2.71.  Invocation command line was

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

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

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

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

 cat <<'EOF'
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/contrib/remind-conf-mode/remind-conf-mode.el
@@ -117,7 +117,8 @@
         "NOQUEUE" "OMIT" "OMITFUNC" "ONCE" "POP" "POP-OMIT-CONTEXT" "PRESERVE"
         "PRIORITY" "PS" "PSFILE" "PUSH" "PUSH-OMIT-CONTEXT" "REM" "RUN"
         "SATISFY" "SCAN" "SCANFROM" "SCHED" "SECOND" "SET" "SKIP" "SPECIAL"
-         "TAG" "THIRD" "THROUGH" "UNSET" "UNTIL" "WARN")
+         "SYSINCLUDE" "TAG" "THIRD" "THROUGH" "TRANSLATE" "TRANS" "UNSET"
+         "UNTIL" "WARN")
   #'(lambda (a b) (> (length a) (length b)))))


@@ -162,7 +163,7 @@

 (defconst remind-builtin-functions
  (sort
-   (list "abs" "access" "adawn" "adusk" "ampm" "ansicolor" "args" "asc"
+   (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" "evaltrig" "filedate" "filedatetime" "filedir"
@@ -188,21 +189,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)

@@ -216,7 +217,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)

@@ -237,14 +238,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)

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

 (defconst remind-conf-font-lock-keywords-2
  (append remind-conf-font-lock-keywords-1
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,6 +1,76 @@
 CHANGES TO REMIND

-* VERSION 5.1 Patch 0 - 2024-??-??
+* VERSION 5.2 Patch 1 - 2024-12-16
+
+- BUG FIX: remind: Fix a logic error that only showed itself on big-endian
+  architectures.  Found thanks to Debian testing and a notification from
+  Jochen Sprickerhof.
+
+* VERSION 5.2 Patch 0 - 2024-12-16
+
+- MAJOR NEW FEATURE: remind: Add the TRANSLATE command, the _()
+  built-in function and the %(...) substitution sequence.  These allow
+  you to localize your reminder files more easily.  The translation table
+  is also made available to back-ends like rem2pdf and tkremind,
+  which they can use as they see fit.
+
+- MINOR FEATURE: tkremind, rem2html: Localize the names of the moon
+  phases.
+
+- MAJOR CHANGE: remind: Remind used to support compile-time localization
+  into different languages (French, English, etc.)  That compile-time
+  support has been removed and all localization is now done at run-time.
+
+- NEW FEATURE: remind: In JSON daemon mode (-zj), the front-end can
+  request translation table entries from the Remind daemon, allowing the
+  front-end to localize messages.
+
+- UPDATE: Update national holidays following update to upstream Python
+  library.
+
+- MINOR FEATURE: Add standard include/sun.rem file for sunrise/sunset.
+
+- MINOR FEATURE:  The SYSINCLUDE command has been added.  The command:
+
+      SYSINCLUDE foo/bar.rem
+
+  is equivalent to:
+
+      INCLUDE [$SysInclude]/foo/bar.rem
+
+- MINOR IMPROVEMENT: Allow INCLUDE, DO and SYSINCLUDE to include files with
+  spaces in their names; in this case, you have to put the filename inside
+  double-quotes.
+
+- IMPROVEMENT: remind: Refuse to open subdirectories named "*.rem"
+  under a top-level directory rather than trying and failing with a
+  confusing error.
+
+- IMPROVEMENT: contrib/remind-conf-mode: Fix a few bugs and choose colors
+  that are easier on the eyes.
+
+- IMPROVEMENT: remind: Remind used to have three completely separate
+  hash table implementations.  They have all been replaced with a single
+  implementation; this new implementation adapts the hash table size based
+  on the number of entries and is dramatically faster than the old code
+  when there are a large number of entries.
+
+- MINOR FIXES: remind: Fix typos in comments; use memcpy to copy OMIT
+  contexts internally.
+
+- BUG FIX: remind: Actually allow the documented 9 levels of INCLUDE
+  rather than 8.
+
+- BUG FIX: remind: If an INCLUDE statement failed inside an IF statement,
+  Remind would print spurious errors about unmatched IF/ENDIF.  This has
+  been fixed.
+
+* VERSION 5.1 Patch 1 - 2024-11-18
+
+- BUG FIX: Fix a bug in test-rem that could have caused test failures.
+  Fix courtesy of Jochen Sprickerhof.
+
+* VERSION 5.1 Patch 0 - 2024-11-18

 - MAJOR IMPROVEMENT: Include holiday files for many countries and
  regions, courtesy of the Python "holidays" project:
--- a/include/holidays/README
+++ b/include/holidays/README
@@ -54,8 +54,8 @@ advance warning of holidays:
    FSET msgsuffix(x) char(8) + dosubst(" is %b.%", $T)

    # Include your holiday files here...
-    INCLUDE [$SysInclude]/holidays/us.rem
-    INCLUDE [$SysInclude]/holidays/us/ny.rem
+    SYSINCLUDE holidays/us.rem
+    SYSINCLUDE holidays/us/ny.rem

    # Restore old version of msgsuffix and $DefaultDelta
    FRENAME saved_msgsuffix msgsuffix
--- a/include/holidays/ad.rem
+++ b/include/holidays/ad.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ad/
+# [$SysInclude]/holidays/ad/

 OMIT 1 January MSG New Year's Day
 OMIT 6 January MSG Epiphany
--- a/include/holidays/ad/02.rem
+++ b/include/holidays/ad/02.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# 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
--- a/include/holidays/ad/03.rem
+++ b/include/holidays/ad/03.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# 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
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# also include [$SysInclude]/holidays/ad.rem

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

 REM Friday 23 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
 REM Saturday 24 July ADDOMIT SCANFROM -28 MSG Sant Julià de Lòria Annual Festival
--- a/include/holidays/ad/07.rem
+++ b/include/holidays/ad/07.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# 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
--- a/include/holidays/ad/08.rem
+++ b/include/holidays/ad/08.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ad.rem
+# 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/at.rem
+++ b/include/holidays/at.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/at/
+# [$SysInclude]/holidays/at/

 OMIT 1 January MSG Neujahr
 OMIT 6 January MSG Heilige Drei Könige
--- a/include/holidays/at/1.rem
+++ b/include/holidays/at/1.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/at.rem
+# also include [$SysInclude]/holidays/at.rem


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


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


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


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


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


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


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


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


 # Optional holidays
--- a/include/holidays/au.rem
+++ b/include/holidays/au.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/au/
+# [$SysInclude]/holidays/au/

 OMIT 1 January MSG New Year's Day
 OMIT 26 January MSG Australia Day
--- a/include/holidays/au/act.rem
+++ b/include/holidays/au/act.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/nsw.rem
+++ b/include/holidays/au/nsw.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/nt.rem
+++ b/include/holidays/au/nt.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/qld.rem
+++ b/include/holidays/au/qld.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/sa.rem
+++ b/include/holidays/au/sa.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/tas.rem
+++ b/include/holidays/au/tas.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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
--- a/include/holidays/au/vic.rem
+++ b/include/holidays/au/vic.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/au/wa.rem
+++ b/include/holidays/au/wa.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/au.rem
+# 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)
--- a/include/holidays/ba.rem
+++ b/include/holidays/ba.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ba/
+# [$SysInclude]/holidays/ba/

 OMIT 1 January MSG Nova godina
 OMIT 2 January MSG Nova godina
--- a/include/holidays/ba/bih.rem
+++ b/include/holidays/ba/bih.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# 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)
--- a/include/holidays/ba/brc.rem
+++ b/include/holidays/ba/brc.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# 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)
--- a/include/holidays/ba/srp.rem
+++ b/include/holidays/ba/srp.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ba.rem
+# 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)
--- a/include/holidays/bo.rem
+++ b/include/holidays/bo.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/bo/
+# [$SysInclude]/holidays/bo/

 OMIT 1 January MSG Año Nuevo
 REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
--- a/include/holidays/bo/b.rem
+++ b/include/holidays/bo/b.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# 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
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem

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

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

 OMIT [easterdate($Uy)-51] MSG Carnaval de Oruro
--- a/include/holidays/bo/p.rem
+++ b/include/holidays/bo/p.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# 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
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/bo.rem
+# also include [$SysInclude]/holidays/bo.rem

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

 OMIT 15 April MSG La Tablada
--- a/include/holidays/br.rem
+++ b/include/holidays/br.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/br/
+# [$SysInclude]/holidays/br/

 OMIT 1 January MSG Confraternização Universal
 OMIT [easterdate($Uy)-2] MSG Sexta-feira Santa
--- a/include/holidays/br/ac.rem
+++ b/include/holidays/br/ac.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

 REM 23 January ADDOMIT SCANFROM -28 SATISFY [$Tw < 2 || $Tw > 4] MSG Dia do Evangélico
 REM Friday 23 January ADDOMIT SCANFROM -23 SATISFY [wkdaynum(date($Ty, 1, 23)) >= 2 && wkdaynum(date($Ty, 1, 23)) <= 4] MSG Dia do Evangélico
--- a/include/holidays/br/al.rem
+++ b/include/holidays/br/al.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

 OMIT 24 June MSG São João
 OMIT 29 June MSG São Pedro
--- a/include/holidays/br/am.rem
+++ b/include/holidays/br/am.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# 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
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

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

 OMIT 19 March MSG São José
 OMIT 25 March MSG Abolição da escravidão no Ceará
--- a/include/holidays/br/df.rem
+++ b/include/holidays/br/df.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

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

 OMIT 26 July MSG Fundação da cidade de Goiás
 OMIT 24 October MSG Pedra fundamental de Goiânia
--- a/include/holidays/br/ma.rem
+++ b/include/holidays/br/ma.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# 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
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

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

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

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

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

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

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

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

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

 OMIT 7 August MSG Dia do Rio Grande do Norte
 OMIT 3 October MSG Mártires de Cunhaú e Uruaçuu
--- a/include/holidays/br/ro.rem
+++ b/include/holidays/br/ro.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

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

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

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

 REM Sunday 11 August ADDOMIT SCANFROM -28 MSG Dia do Estado de Santa Catarina
 REM Sunday 25 November ADDOMIT SCANFROM -28 MSG Dia de Santa Catarina de Alexandria
--- a/include/holidays/br/se.rem
+++ b/include/holidays/br/se.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/br.rem
+# also include [$SysInclude]/holidays/br.rem

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

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

 OMIT 18 March MSG Dia da Autonomia
 OMIT 8 September MSG Nossa Senhora da Natividade
--- a/include/holidays/ca.rem
+++ b/include/holidays/ca.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ca/
+# [$SysInclude]/holidays/ca/

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

 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day

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

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

 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Louis Riel Day

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

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

 OMIT 1 July MSG Memorial Day

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

 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Heritage Day

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

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

 REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday

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

 REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day

--- a/include/holidays/ca/pe.rem
+++ b/include/holidays/ca/pe.rem
@@ -8,6 +8,6 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ca.rem
+# also include [$SysInclude]/holidays/ca.rem

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

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

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

 OMIT 21 June MSG National Aboriginal Day
 REM Third Monday in August ADDOMIT SCANFROM -28 MSG Discovery Day
--- a/include/holidays/ch.rem
+++ b/include/holidays/ch.rem
@@ -10,7 +10,7 @@
 #
 # For region-specific holidays, you need to include
 # one of the regional *.rem files in the directory
-# [$SysInclude]/ch/
+# [$SysInclude]/holidays/ch/

 OMIT 1 January MSG Neujahr
 OMIT [easterdate($Uy)+39] MSG Auffahrt
--- a/include/holidays/ch/ag.rem
+++ b/include/holidays/ch/ag.rem
@@ -8,7 +8,7 @@
 # See important caveats in the file ../README
 #
 # If you want the national holidays as well, you must
-# also include [$SysInclude]/ch.rem
+# also include [$SysInclude]/holidays/ch.rem

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

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

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

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

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

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

 OMIT [easterdate($Uy)-2] MSG Karfreitag

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

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

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

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

 OMIT 2 January MSG Berchtoldstag
 OMIT [easterdate($Uy)-2] MSG Karfreitag
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dianne Skoll	078dba1e98	Prepare for 05.02.01 release. All checks were successful Remind unit tests / tests (push) Successful in 28s Details	2024-12-16 19:37:31 -05:00
Dianne Skoll	8ebec9584c	Fix incorrect comparison code.	2024-12-16 19:33:41 -05:00
Dianne Skoll	2504b39be2	Remove const qualifier. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-16 17:10:45 -05:00
Dianne Skoll	e394f402f8	Set release date. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-16 09:31:02 -05:00
Dianne Skoll	5a2914f6c7	Start hash tables with 7 buckets instead of 17; print more detailed hash stats with -ds; consistently use ErrFp instead of stderr All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-14 11:52:16 -05:00
Dianne Skoll	a19b009f7c	Fix man page typo and cppcheck warnings. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-13 15:22:46 -05:00
Dianne Skoll	6373ae8ca5	Update release notes.	2024-12-13 15:08:54 -05:00
Dianne Skoll	b8c4786b33	Allow INCLUDE/DO/SYSINCLUDE to take a QuotedString argument. This allows for filenames with spaces in them.	2024-12-13 10:38:34 -05:00
Dianne Skoll	4e7cfc20ce	Make use of SYSINCLUDE. All checks were successful Remind unit tests / tests (push) Successful in 32s Details	2024-12-13 08:28:14 -05:00
Dianne Skoll	0c9a35a584	Add SYSINCLUDE to release notes.	2024-12-13 08:22:43 -05:00
Dianne Skoll	5e333f6162	Add the SYSINCLUDE directive.	2024-12-13 08:18:22 -05:00
Dianne Skoll	af8b4e6df1	Add const qualifier on Sysvar.value. All checks were successful Remind unit tests / tests (push) Successful in 44s Details	2024-12-12 20:27:54 -05:00
Dianne Skoll	3fa798523a	Document the difference between %(foo) and [_("foo")]	2024-12-12 16:56:38 -05:00
Dianne Skoll	53001f9fbc	Update WHATSNEW	2024-12-12 16:48:53 -05:00
Dianne Skoll	9cd76eae84	Fix typo	2024-12-12 16:47:34 -05:00
Dianne Skoll	c8295b6251	Convert files we ship to use %(foo) in place of [_("foo")]	2024-12-12 16:43:30 -05:00
Dianne Skoll	3c95245407	In the substitution filter, make %(foo) equivalent to [_("foo")]	2024-12-12 16:35:31 -05:00
Dianne Skoll	3362c7226c	Add regression test for commit `356b562d75` All checks were successful Remind unit tests / tests (push) Successful in 31s Details	2024-12-12 12:17:15 -05:00
Dianne Skoll	356b562d75	Fix logic error in resetting IF flags and Popfile interaction.	2024-12-12 12:14:29 -05:00
Dianne Skoll	6eebcdc39d	Handle error return from GetSysVar.	2024-12-12 11:58:27 -05:00
Dianne Skoll	5a80d63060	Add localization tests.	2024-12-12 11:55:07 -05:00
Dianne Skoll	c7ca1b4baa	Get rid of the DyamicFoo hacks and make most translatable variables live in the translation table.	2024-12-12 11:43:03 -05:00
Dianne Skoll	dc89a6fba9	Eliminate unnecessary test.	2024-12-12 10:12:50 -05:00
Dianne Skoll	f83fec5563	Add missing three Chinese New Year animals.	2024-12-12 09:55:30 -05:00
Dianne Skoll	9c38161430	Merge branch 'translation_de' into 'master' Add German translations See merge request dskoll/remind!8	2024-12-12 14:53:21 +00:00
Jochen Sprickerhof	68f5fe1d10	Add German translations Based on nl.rem	2024-12-12 12:51:38 +01:00
Dianne Skoll	bc7c57e53b	Add another translation-propagation test. All checks were successful Remind unit tests / tests (push) Successful in 27s Details	2024-12-11 20:10:11 -05:00
Dianne Skoll	88aacb3905	Get two-way propagation working properly.	2024-12-11 20:08:09 -05:00
Dianne Skoll	a894076bfc	Verify two-way correspondence between translation table and system variables.	2024-12-11 19:48:19 -05:00
Dianne Skoll	82e068fcca	Refactor SetSysVar.	2024-12-11 19:22:30 -05:00
Dianne Skoll	a119d97539	Make mapping between translatable system variables and TRANSLATE table table-driven.	2024-12-11 19:15:44 -05:00
Dianne Skoll	01afb63a3d	Sent translations with only the first month, in a multi-month (-pN) output.	2024-12-11 18:07:48 -05:00
Dianne Skoll	54fccabdfe	Escape the result of translation, in case a bad translation file includes HTML special characters.	2024-12-11 17:15:01 -05:00
Dianne Skoll	ba4d44664f	Clarify docs. All checks were successful Remind unit tests / tests (push) Successful in 34s Details	2024-12-11 15:36:17 -05:00
Dianne Skoll	d76c5499b5	Document how translation table is passed to back-ends.	2024-12-11 15:35:31 -05:00
Dianne Skoll	84e8244e48	Use localized names for "Full Moon", etc.	2024-12-11 15:35:23 -05:00
Dianne Skoll	92a6115a5c	Send the translation table to back-ends.	2024-12-11 15:24:37 -05:00
Dianne Skoll	b98e336e9e	Tweak release notes.	2024-12-11 14:02:30 -05:00
Dianne Skoll	ffcd21446e	Update WHATSNEW	2024-12-11 13:55:23 -05:00
Dianne Skoll	af9ca68d99	Document the need for %-style escape sequences in translations to match those in the original message.	2024-12-11 13:42:49 -05:00
Dianne Skoll	71db7168a1	Increase update-for-changes delay to 250ms	2024-12-11 10:25:45 -05:00
Dianne Skoll	54f284c43f	Note that strlen returns number of bytes, not characters.	2024-12-11 09:45:40 -05:00
Dianne Skoll	0ab93f2dea	Guard against printf-style formatting attacks by malicious translation files.	2024-12-11 09:43:04 -05:00
Dianne Skoll	3d97f87bcd	Remove obsolet error messages	2024-12-11 09:33:31 -05:00
Dianne Skoll	dcfa6d8ef8	Add translation for No reminders. All checks were successful Remind unit tests / tests (push) Successful in 33s Details	2024-12-10 19:59:00 -05:00
Dianne Skoll	52dd5332f4	Fix banner for Dutch translation.	2024-12-10 19:57:08 -05:00
Dianne Skoll	7b5fafe1ab	Document how _() looks for translations.	2024-12-10 19:48:26 -05:00
Dianne Skoll	929af71a10	Fix test.	2024-12-10 18:21:24 -05:00
Dianne Skoll	abf7c74ff2	When dumping translation table NOT to JSON, always start with LANGID	2024-12-10 18:20:48 -05:00
Dianne Skoll	5b9d9a67b2	Make daemon not respond at all to a TRANSLATE for which there is no entry.	2024-12-10 17:16:25 -05:00
Dianne Skoll	16ca2ade23	Clear out translations when we prepare to ask for new ones.	2024-12-10 17:09:25 -05:00
Dianne Skoll	d3e6c81a3a	Synthesize mixed-case translations.	2024-12-10 17:02:41 -05:00
Dianne Skoll	13ae49d3cd	Put LANGID near the top.	2024-12-10 15:35:53 -05:00
Dianne Skoll	78adc9f61d	Document how translators should use LANGID.	2024-12-10 15:33:22 -05:00
Dianne Skoll	a622d4fad4	Add LANGID translations to all language packs.	2024-12-10 15:27:41 -05:00
Dianne Skoll	6c0e7b4ff5	Add a second torture test to test hash-table resizing. All checks were successful Remind unit tests / tests (push) Successful in 31s Details	2024-12-10 15:12:24 -05:00
Dianne Skoll	28e0599380	Get new translations if inotify says something has changed.	2024-12-10 15:05:48 -05:00
Dianne Skoll	87445f639c	Don't print the "" error message for translators.	2024-12-10 14:09:02 -05:00
Dianne Skoll	af6e159eaa	Refresh translations if they seem to have changed. :)	2024-12-10 13:32:50 -05:00
Dianne Skoll	bffa28e258	Implement the "TRANSLATE" command to translate just one string; rename "JSONTRANSLATE" to "TRANSLATE_DUMP"	2024-12-10 13:06:12 -05:00
Dianne Skoll	1781f84d84	Merely schedule an update when we get the translation table.	2024-12-10 12:24:53 -05:00
Dianne Skoll	ed6e65182e	Document JSONTRANSLATE daemon command.	2024-12-10 12:21:06 -05:00
Dianne Skoll	f5cc0ec686	Get translation table; translate moon phases in TkRemind.	2024-12-10 12:16:27 -05:00
Dianne Skoll	a2c818f96c	Fully implement JSONTRANSLATE daemon command.	2024-12-10 11:57:52 -05:00
Dianne Skoll	0bbbaaf3d9	Implement JSONTRANSLATE -zj command.	2024-12-10 11:48:01 -05:00
Dianne Skoll	1c81d4cae3	Add sunrise/sunset standard include file.	2024-12-10 11:38:57 -05:00
Dianne Skoll	56c684087b	Add Sunrise and Sunset translations.	2024-12-10 11:34:44 -05:00
Dianne Skoll	9500a929ea	Fix indentation.	2024-12-10 11:00:13 -05:00
Dianne Skoll	585d45e4a1	Completely remove support for compile-time localization. All localization is now done at run-time.	2024-12-10 10:58:09 -05:00
Dianne Skoll	67d1d1366d	Add error message translations.	2024-12-10 10:39:13 -05:00
Dianne Skoll	f4018892e8	Be pickier about syntax.	2024-12-10 10:25:38 -05:00
Dianne Skoll	ffd309f89d	Add missing translations.	2024-12-09 23:28:10 -05:00
Dianne Skoll	286babc1bf	Avoid memory leak.	2024-12-09 23:23:39 -05:00
Dianne Skoll	cc3c0040e9	Fix comment. All checks were successful Remind unit tests / tests (push) Successful in 28s Details	2024-12-09 23:21:53 -05:00
Dianne Skoll	b33a1ee98b	Better error message if we hit EOLN after TRANSLATE.	2024-12-09 23:19:48 -05:00
Dianne Skoll	99706741bb	Translate error messages in pl.rem	2024-12-09 23:04:52 -05:00
Dianne Skoll	df73a74503	Better colors (for me, at any rate...) All checks were successful Remind unit tests / tests (push) Successful in 34s Details	2024-12-09 21:11:01 -05:00
Dianne Skoll	c747ebebb4	Don't escape high chars. :)	2024-12-09 20:55:26 -05:00
Dianne Skoll	6b412062c2	Dump translation table in a way that it can be re-ingested.	2024-12-09 20:53:44 -05:00
Dianne Skoll	27b688f82c	Highlight strings first.	2024-12-09 20:46:44 -05:00
Dianne Skoll	4c314ff81c	Add --print-errs and localize error messages in lang/fr.rem.	2024-12-09 20:40:41 -05:00
Dianne Skoll	d2955ec733	Fix solstice translation.	2024-12-09 20:15:37 -05:00
Dianne Skoll	480216db9e	Update test file	2024-12-09 20:08:46 -05:00
Dianne Skoll	9dbb0de7e6	Fix bug in ParseQuotedString	2024-12-09 20:07:29 -05:00
Dianne Skoll	9f9ae77895	Bound-check GetErr	2024-12-09 20:03:15 -05:00
Dianne Skoll	d9796e72e5	Allow error messages to be localized.	2024-12-09 19:55:23 -05:00
Dianne Skoll	e0b0d043c6	Add release notes	2024-12-09 19:09:37 -05:00
Dianne Skoll	fe4499ab72	Make comparison function also useful for ordering.	2024-12-09 18:39:49 -05:00
Dianne Skoll	e50d583659	Use case-sensitive hashing for dedup and translation hash tables.	2024-12-09 18:36:53 -05:00
Dianne Skoll	6b05d772f0	Exit if we run out of memory initializing hash tables. There's no sane way to recover.	2024-12-09 18:10:03 -05:00
Dianne Skoll	84dd73f023	Note connection between translation-related special variables and translation table.	2024-12-09 18:06:21 -05:00
Dianne Skoll	00dca8b70f	Bump version to 05.02.00.	2024-12-09 17:59:40 -05:00
Dianne Skoll	c4bc145cd9	Document the translation table.	2024-12-09 17:56:52 -05:00
Dianne Skoll	bd614c1cde	Make only one call to malloc() per XlateItem.	2024-12-09 17:07:58 -05:00
Dianne Skoll	1446ac0552	Make the output of "make test" considerably less verbose. All checks were successful Remind unit tests / tests (push) Successful in 33s Details	2024-12-09 14:33:02 -05:00
Dianne Skoll	26ded447ab	Fix some translations.	2024-12-09 14:24:14 -05:00
Dianne Skoll	a4ccb0738e	Make Chinese New Year file translatable.	2024-12-09 14:20:27 -05:00
Dianne Skoll	27a1b449bd	Add new keywords and built-in function.	2024-12-09 14:14:29 -05:00
Dianne Skoll	1443282859	Add a whack more torture tests.	2024-12-09 14:09:40 -05:00
Dianne Skoll	4a2d707654	Properly handle deleting everything out of a hash table.	2024-12-09 13:59:41 -05:00
Dianne Skoll	fd2a61928c	Fix NL translation.	2024-12-09 13:32:21 -05:00
Dianne Skoll	a05d9eefc9	Make "SET $foo" also add a translation table entry if $foo is a dynamic translation variable.	2024-12-09 13:29:05 -05:00
Dianne Skoll	6f230e81bd	Add translations for moon phases and seasons.	2024-12-09 13:05:34 -05:00
Dianne Skoll	973019c4c7	Implement TRANSLATE keyword.	2024-12-09 12:56:40 -05:00
Dianne Skoll	cb712ad7e7	Replace the individual hash table implementations with a unified one.	2024-12-09 11:54:52 -05:00
Dianne Skoll	be7c67b6fd	Add ParseQuotedString function for eventually implementing TRANSLATE directive.	2024-12-08 11:54:49 -05:00
Dianne Skoll	a933c8bc69	Document that we don't read subdirectories when expanding *.rem. All checks were successful Remind unit tests / tests (push) Successful in 31s Details	2024-12-06 20:21:09 -05:00
Dianne Skoll	087fbfd8e6	If a path returned by glob is a directory, ignore it.	2024-12-06 20:18:45 -05:00
Dianne Skoll	ff641d7990	Refuse to open directories.	2024-12-06 20:09:30 -05:00
Dianne Skoll	54e788b765	Make the sun functions return E_SWERR if BASE != 1990. All checks were successful Remind unit tests / tests (push) Successful in 44s Details	2024-12-04 13:12:40 -05:00
Dianne Skoll	4283feff31	Change #error to #warning so cppcheck can analyze funcs.c	2024-12-04 13:10:03 -05:00
Dianne Skoll	062a84b758	Simplify HAS_DATE and HAS_TIME macros by making type values into bitmasks. All checks were successful Remind unit tests / tests (push) Successful in 34s Details	2024-12-02 09:50:33 -05:00
Dianne Skoll	d161a8ff1a	Actually allow up to 9 levels of INCLUDE nesting. All checks were successful Remind unit tests / tests (push) Successful in 42s Details	2024-11-30 23:03:09 -05:00
Dianne Skoll	0df4a79531	Use memcpy to copy omit contexts.	2024-11-30 22:42:40 -05:00
Dianne Skoll	1b26e39e2f	Update holidays as per recent commits to the Python library. All checks were successful Remind unit tests / tests (push) Successful in 25s Details	2024-11-24 21:44:30 -05:00
Dianne Skoll	c63c4cf07e	Make token name const.	2024-11-19 22:59:47 -05:00
Dianne Skoll	586b3565f0	Sort token types.	2024-11-19 22:58:19 -05:00
Dianne Skoll	877aaed1a1	Fix spelling error in comment.	2024-11-18 11:20:13 -05:00
Dianne Skoll	57fa1a6099	Make it clearer what went wrong if we use "remind" rather than "../src/remind" All checks were successful Remind unit tests / tests (push) Successful in 1m44s Details	2024-11-18 11:05:21 -05:00
Dianne Skoll	6cdb12b5a8	Instead of searching test-rem for "remind" without "../src/remind", simply alias remind to false. Trick suggested by Jochen Sprickerhof.	2024-11-18 11:00:10 -05:00
Dianne Skoll	c73e1b6f97	Make test-rem test itself to ensure it always invokes remind as ../src/remind.	2024-11-18 10:50:43 -05:00
Dianne Skoll	e8c779c785	Update to 05.01.01.	2024-11-18 10:44:08 -05:00
Dianne Skoll	96e076a13f	Prep for release.	2024-11-18 10:31:56 -05:00
Dianne Skoll	80d258621a	Merge branch 'fix_test' into 'master' Fix `remind` call in test See merge request dskoll/remind!7	2024-11-18 15:31:27 +00:00
Jochen Sprickerhof	ed6d35e418	Fix `remind` call in test	2024-11-18 16:28:18 +01:00
Dianne Skoll	9dca1840a1	Fix typo Some checks failed Remind unit tests / tests (push) Failing after 30s Details	2024-11-16 20:54:40 -05:00
Dianne Skoll	f4ec23df90	Make uk a symlink to gb Some checks failed Remind unit tests / tests (push) Failing after 28s Details	2024-11-16 09:17:02 -05:00
Dianne Skoll	a0536a8141	Fix paths to files in comments. Noted by Martin Ziemer. Some checks failed Remind unit tests / tests (push) Failing after 29s Details	2024-11-15 09:19:17 -05:00
Dianne Skoll	553899127a	Diagnose redefinition of built-in functions by checking newname before oldname Some checks failed Remind unit tests / tests (push) Failing after 30s Details	2024-11-14 22:27:54 -05:00
Dianne Skoll	73519889c7	Add UK Remembrance Day Some checks failed Remind unit tests / tests (push) Failing after 29s Details	2024-11-14 11:21:57 -05:00