Update WHATSNEW

Reported by Zoltan Puskas; see https://bugs.gentoo.org/889318

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+
+liberapay: dskoll

.github/README.md

@@ -0,0 +1,7 @@
+# Remind has moved
+
+For various reasons, I have decided to move Remind off GitHub.  This repo
+will be archived.  To create merge requests or issues, please visit
+Remind's new home at https://salsa.debian.org/dskoll/remind
+
+-- Dianne Skoll

.github/workflows/github-action.yml

@@ -0,0 +1,29 @@
+# language: bash
+---
+
+name: Remind unit tests
+
+on:
+  push
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Remind
+        uses: actions/checkout@v2
+      - name: Add test user
+        run: |
+          sudo adduser --home /home/testuser --gecos 'Test User' --disabled-password testuser
+      - name: Fix ownership
+        run: |
+          sudo chown -R testuser .
+      - name: Build
+        run: |
+          sudo su -c './configure && make' testuser
+      - name: Run Tests
+        run: |
+          sudo su -c 'make test' testuser
+      - name: Fix up permissions so GitHub does not complain
+        run: |
+          sudo chmod -R a+rwX .

.gitignore

@@ -1,27 +1,34 @@
-rem2pdf/Makefile.old
 *.bak
 *.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.1
+rem2pdf/Makefile.PL
+rem2pdf/Makefile.old
+rem2pdf/Makefile.top
+rem2pdf/bin/rem2pdf
+set-irc-topic
 src/*.tar.gz*
 src/Makefile
 src/config.h
 src/rem2ps
 src/remind
+src/test-*.out
 src/version.h
 tests/test.out
 www/Makefile
-rem2pdf/Makefile.PL
-MYMETA.json
-MYMETA.yml
-Makefile
-blib/
-pm_to_blib
-rem2pdf/Makefile.top
-rem2pdf/bin/rem2pdf
-rem2html/rem2html.1
+gmon.out

.gitlab-ci.yml

@@ -0,0 +1,13 @@
+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

COPYRIGHT

@@ -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 1992-2023 Dianne Skoll, except where noted in
 individual files.
 
 3. DISTRIBUTION AND USE

Makefile

@@ -1,4 +1,5 @@
 # Top-level Makefile for Remind.
+# SPDX-License-Identifier: GPL-2.0-only
 
 all: src/Makefile
 	@echo ""
@@ -12,20 +13,33 @@ all: src/Makefile
 	@$(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 {} \;
+	-rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1
 	-$(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:
 	@$(MAKE) -C src -s test
 

README

@@ -34,5 +34,45 @@ If you do NOT have Tcl/Tk or are NOT running X Windows:
 
 5) Type: "make install" -- you may need to be root to do this.
 
+PREREQUISITES:
+--------------
+
+Remind and rem2ps have no prerequisites beyond the standard C library and
+the standard math library.
+
+Rem2HTML requires the JSON::MaybeXS Perl module.
+Rem2PDF requires the JSON::MaybeXS, Pango and Cairo Perl modules.
+
+- On Debian-like systems, these prerequisites may be installed with:
+
+    apt install libjson-maybexs-perl libpango-perl libcairo-perl
+
+- On RPM-based systems, you need perl-Pango, perl-Cairo and perl-JSON-MaybeXS
+
+- On Gentoo, you need dev-perl/Pango, dev-perl/Cairo and dev-perl/JSON-MaybeXS.
+
+- On Arch linux, you need pango-perl, cairo-perl and perl-json-maybexs
+
+TkRemind requires Tcl/Tk and the tcllib library.
+
+- On Debian-like systems, install with:
+
+    apt install tcl tk tcllib
+
+- On RPM-based systems, you need tcl, tk and tcllib
+
+- On Arch Linux, you need tk and tcllib.  The latter is available at
+  https://aur.archlinux.org/packages/tcllib
+
+If the little arrows for "Previous Month" and "Next Month" do not display
+correctly in TkRemind, you may need to install the Noto Fonts.  Install
+all of your distribution's Nonto Font-related packages.
+
+- On Debian-like systems, install with:
+
+    apt install fonts-noto-core fonts-noto-color-emoji \
+        fonts-noto-extra fonts-noto-ui-core fonts-noto-ui-extra
+
+==========================================================================
 Contact info: mailto:dianne@skoll.ca
 Home page:    https://dianne.skoll.ca/projects/remind/

build.tk

@@ -1,5 +1,6 @@
 #!/bin/sh
 # -*-Mode: TCL;-*-
+# SPDX-License-Identifier: GPL-2.0-only
 
 #--------------------------------------------------------------
 #   BUILD.TK
@@ -355,7 +356,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

configure

@@ -622,6 +622,7 @@ ac_includes_default="\
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+RELEASE_DATE
 PERLARTIFACTS
 VERSION
 EGREP
@@ -3306,7 +3307,6 @@ fi
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
 $as_echo_n "checking for sqrt in -lm... " >&6; }
 if ${ac_cv_lib_m_sqrt+:} false; then :
@@ -3974,6 +3974,29 @@ fi
 
 if test "$GCC" = yes; then
 	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
+        # Check for link-time optimization support
+        f=-flto=auto
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $f" >&5
+$as_echo_n "checking whether $CC supports $f... " >&6; }
+        if $CC -E $f /dev/null > /dev/null 2>&1 ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            CFLAGS="$CFLAGS $f"
+            f=-ffat-lto-objects
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $f" >&5
+$as_echo_n "checking whether $CC supports $f... " >&6; }
+            if $CC -E $f /dev/null > /dev/null 2>&1 ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                CFLAGS="$CFLAGS $f"
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            fi
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
 fi
 
 if test "$ac_cv_perlartifacts" = "yes" ; then
@@ -3982,6 +4005,14 @@ 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
 for ac_func in setenv unsetenv glob mbstowcs setlocale initgroups
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -3994,11 +4025,12 @@ _ACEOF
 fi
 done
 
-VERSION=03.04.02
+VERSION=04.02.02
 
 
 
-ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf"
+
+ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4698,6 +4730,10 @@ do
     "rem2pdf/Makefile.PL") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.PL" ;;
     "rem2pdf/Makefile.top") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.top" ;;
     "rem2pdf/bin/rem2pdf") CONFIG_FILES="$CONFIG_FILES rem2pdf/bin/rem2pdf" ;;
+    "man/rem.1") CONFIG_FILES="$CONFIG_FILES man/rem.1" ;;
+    "man/rem2ps.1") CONFIG_FILES="$CONFIG_FILES man/rem2ps.1" ;;
+    "man/remind.1") CONFIG_FILES="$CONFIG_FILES man/remind.1" ;;
+    "man/tkremind.1") CONFIG_FILES="$CONFIG_FILES man/tkremind.1" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.in

@@ -28,8 +28,6 @@ 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
@@ -48,6 +46,23 @@ AC_HEADER_TIME
 
 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 -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 -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
 
 if test "$ac_cv_perlartifacts" = "yes" ; then
@@ -56,10 +71,19 @@ 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(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=03.04.02
+VERSION=04.02.02
 AC_SUBST(VERSION)
 AC_SUBST(PERL)
 AC_SUBST(PERLARTIFACTS)
-AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf)
+AC_SUBST(RELEASE_DATE)
+AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1)
 chmod a+x rem2pdf/bin/rem2pdf

contrib/ical2rem.pl

@@ -32,7 +32,7 @@
 # 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
+#	- Suppress 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
@@ -84,7 +84,7 @@ How may days in advance to start getting reminders about the events. Defaults to
 
   ical2rem.pl --no-todos
 
-If you don't care about the ToDos the calendar, this will surpress
+If you don't care about the ToDos the calendar, this will suppress
 printing of the ToDo heading, as well as skipping ToDo processing. 
 
 =head2 --heading

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];

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.15
+;; 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
@@ -91,7 +91,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
@@ -133,20 +132,20 @@
 
 (defconst remind-builtin-variables
   (sort
-   (list "$April" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep"
+   (list "$Ago" "$Am" "$And" "$April" "$At" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep"
          "$DateTimeSep" "$December" "$DefaultColor" "$DefaultPrio"
          "$DefaultTDelta" "$DeltaOffset" "$DontFork" "$DontQueue"
          "$DontTrigAts" "$EndSent" "$EndSentIg" "$February" "$FirstIndent"
-         "$FoldYear" "$FormWidth" "$Friday" "$HushMode" "$IgnoreOnce"
-         "$InfDelta" "$IntMax" "$IntMin" "$January" "$July" "$June" "$LatDeg"
+         "$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" "$MaxSatIter" "$MaxStringLen" "$May"
-         "$MinsFromUTC" "$Monday" "$NextMode" "$November" "$NumQueued"
-         "$NumTrig" "$October" "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday"
+         "$MinsFromUTC" "$Minute" "$Monday" "$Mplu" "$NextMode" "$November" "$Now" "$NumQueued"
+         "$NumTrig" "$October" "$On" "$Pm" "$PrefixLineNo" "$PSCal" "$RunOff" "$Saturday"
          "$September" "$SimpleCal" "$SortByDate" "$SortByPrio" "$SortByTime"
-         "$SubsIndent" "$Sunday" "$T" "$Td" "$Thursday" "$TimeSep" "$Tm"
-         "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um" "$UntimedFirst" "$Uw" "$Uy"
-         "$Wednesday")
+         "$SubsIndent" "$Sunday" "$SysInclude" "$T" "$Td" "$Thursday" "$TimeSep" "$Tm"
+         "$Today" "$Tomorrow" "$Tuesday" "$Tw" "$Ty" "$U" "$Ud" "$Um" "$UntimedFirst" "$Uw" "$Uy"
+         "$Was" "$Wednesday")
    #'(lambda (a b) (> (length a) (length b)))))
 
 
@@ -168,7 +167,7 @@
          "hebday" "hebmon" "hebyear" "hour" "iif" "index" "isany" "isdst"
          "isleap" "isomitted" "language" "lower" "max" "min" "minsfromutc"
          "minute" "mon" "monnum" "moondate" "moondatetime" "moonphase"
-         "moontime" "ndawn" "ndusk" "nonomitted" "now" "ord" "ostype" "plural"
+         "moontime" "ndawn" "ndusk" "nonomitted" "now" "ord" "ostype" "pad" "plural"
          "psmoon" "psshade" "realcurrent" "realnow" "realtoday" "sgn" "shell"
          "shellescape" "slide" "strlen" "substr" "sunrise" "sunset" "time"
          "timepart" "today" "trig" "trigback" "trigdate" "trigdatetime"

docs/WHATSNEW

@@ -1,5 +1,281 @@
 CHANGES TO REMIND
 
+* VERSION 4.2 Patch 3 - 2023-??-??
+
+- NEW FEATURE: Remind: add the orthodoxeaster() function to return the
+  date of Orthodox Easter.
+
+- IMPROVEMENT: Add Greek language support courtesy of JeiEl.
+
+- IMPROVEMENT: Add Greek holiday file courtesy of JeiEl.
+
+- IMPROVEMENT: Many internal code tweaks to eliminate many cppcheck
+  static analysis warnings.
+
+- DOCUMENTATION IMPROVEMENT: Clarify the distinction between a "time"
+  and a "duration" as suggested by Ian! D. Allen.
+
+- BUG FIX: Remind: Fix incorrect interaction between sortbanner() and
+  MSF-type reminders.  Bug found by Tim Chase.
+
+- BUG FIX: examples/defs.rem: Fix the calculation of US Tax Day as per
+  Tavis Ormandy and Tim Chase.  Also fixed in include/holidays/us.rem
+
+- BUG FIX: Remind: Add missing #include <fcntl.h> to funcs.c
+
+* VERSION 4.2 Patch 2 - 2023-01-01
+
+- NEW FEATURE: Remind: Add the NOQUEUE modifier to the REM statement for
+  explicitly telling Remind not to queue a timed reminder.
+
+- NEW FEATURE: Remind: Add soleq() function to return the DATETIME of
+  solstices and equinoxes.  See $SysInclude/seasons.rem for an example
+  of how to use the function.
+
+- MINOR IMPROVEMENT: Update examples/astro to include solstices and equinoxes.
+
+- BUG FIX: TkRemind: Provide better error indication if showing today's
+  reminders fails on startup.
+
+- BUG FIX: Remind: Refuse to read world-writable directories.
+
+- BUG FIX: Tests depended on the actual date of the test run.  This has
+  been fixed.
+
+- INTERNAL CHANGE: Remind: Change inappropriately-named "Julian" variables
+  to "DSE" (= Days Since Epoch) since they weren't really holding true
+  Julian dates.
+
+- INTERNAL CHANGE: Add "SPDX-License-Identifier" tags to most files.
+
+* VERSION 4.2 Patch 1 - 2022-12-15
+
+- MINOR IMPROVEMENT: TkRemind: If "Extra Remind Options" contains -m, make
+  TkRemind start the calendar with Monday instead of Sunday.
+
+- MINOR IMPROVEMENT: Sample files: Add French holidays courtesy of
+  Clément Bœsch.
+
+- MINOR IMPROVEMENT: A few performance fixes, likely not even noticeable in
+  most cases.
+
+- MINOR FIXES: Fix misleading comments in the source code.
+
+- MINOR FIX: Remove a bunch of dead code in the moon-phase routines.
+
+- MINOR FIX: Remove unnecessary %"...%" markers in holidays/us.rem
+
+- MINOR FIX: Don't use the -ffat-lto-objects command-line option if we're
+  compiling with Clang.
+
+- MINOR FIX: Remind: Fix a broken printf-format string (need to double up on %
+  to get a literal % in the output.)
+
+- BUG FIX: Make test suite pass regardless of the date on which it is run.
+  D'oh!!!
+
+- BUG FIX: Make sure the banner gets printed each time through a "*N"
+  command-line option loop.
+
+* VERSION 4.2 Patch 0 - 2022-10-14
+
+- NEW FEATURE: remind: Allow weekdays to be globally-omitted.  For example:
+
+       OMIT Saturday Sunday
+
+  globally-omits all Saturdays and Sundays.
+
+- NEW FEATURE: remind: Add ansicolor() built-in function to make it easier
+  to colorize reminders on the terminal.  Suggested by Tim Chase.
+
+- NEW FEATURE: remind: Add several special variables related to the color
+  mode: $UseVTColors, $UseBGVTColors, $Use256Colors, $UseTrueColors and
+  $TerminalBackground.  Based on a suggestion by Tim Chase.
+
+- NEW FEATURE: remind: Add utctolocal() and localtoutc() built-in functions.
+
+- NEW FEATURE: remind: Add timezone() built-in function.
+
+- NEW FEATURE: remind: Add trigtags() function per suggestion from Tim Chase.
+
+- NEW FEATURE: remind: The $AddBlankLines system variable controls whether or
+  not a blank line is added after each reminder.
+
+- NEW FEATURE: remind: The built-in functions columns() and rows() return the
+  width and height of the terminal (in character positions) respectively.
+
+- NEW FEATURE: remind: The built-in function columns("string") returns the
+  number of columns occupied by "string" on the terminal, taking into account
+  double-width Unicode characters and zero-width ANSI escape sequences.
+
+- NEW FEATURE: remind: You can add custom substitution sequences of the form
+  %{name} or %*{name} that end up calling the function subst_name and using
+  its return value as the replacement for the substitution sequence.
+
+- NEW FEATURE: remind: Add the FUNSET command to undefine a user-defined
+  function.
+
+- NEW FILES: Add standard include files holidays/jewish.rem and
+  ansitext.rem (the latter defines standard ANSI escape codes for
+  changing text attributes such as bold, underline, etc.)
+
+- NEW EXAMPLES: add examples/alignmemt.rem, examples/ansitext and
+  examples/astro
+
+- BUG FIX: remind: Make MSF correctly format UTF-8 text and text with
+  embedded ANSI color-changing codes.
+
+- BUG FIX: remind: Make ADDOMIT actually work correctly in a SATISFY-type
+  REM command.  Bug found by Gunther Reißig
+
+- BUG FIX: Convert documentation files and src/lang.h to UTF-8.  Patch
+  from Jochen Sprickerhof.
+
+- BUG FIX: Fix tests in non-UTF-8 locales.
+
+- BUG FIX: Fix a few problems with the include/holidays/us.rem file.
+
+- BUG FIX: remind: Fix an ancient logic error in DBufPutc that hurt
+  performance.
+
+- MINOR IMPROVEMENT: Clean up code and remove some dead code.
+
+* VERSION 4.1 Patch 0 - 2022-09-25
+
+- NEW FEATURE: remind: "remind -c" now supports the MOON special, printing
+  the moon phases in the calendar if the locale supports UTF-8 encoding.
+
+- NEW FEATURE: remind: "remind -c" now supports the SHADE special.  Works
+  best with the 256-color extended XTerm palette or 24-bit true-color
+  terminal escape sequences.
+
+- NEW FEATURE: remind: "remind -c" now supports the WEEK special.
+
+- NEW FEATURE: remind: The new "stdout()" function returns a string describing
+  where stdout is going.  Examples of return values are "TTY" if remind's
+  output is going to terminal, "FILE" if it's redirected to a plain file,
+  or "PIPE" if it's going to a pipe.  See the man page for all the details.
+
+- NEW FEATURE: Add the "-wt" option to set the calendar width to the terminal
+  width even if standard output is a pipe.  Useful for situations like this:
+
+      remind -wt -c .reminders | less -R
+
+- CHANGE: "make install" now no longer strips debugging symbols from the
+  remind and rem2ps executables.  Use "make install-stripped" if you want
+  them stripped.
+
+- CHANGE: remind: "remind -c" highlights today's date in bold, if
+  colors are enabled.
+
+- CHANGE: Dump string values with control characters escaped.
+
+- DOCUMENTATION FIX: Document behavior of DO and filedir() with respect
+  to symbolic links.
+
+- DOCUMENTATION FIX: Add home page link to man pages.  Suggested by Ian! D.
+  Allen.
+
+- DOCUMENTATION FIX: Make date in man pages actually be the release date.
+  Include Remind version in man pages.  Also suggested by Ian! D. Allen.
+
+- DOCUMENTATION FIX: Fix inaccuracy in how string constants were documented.
+
+- BUG FIX: Makefiles: Pass CFLAGS at link-time so link-time optimization
+  actually happens.  Pointed out by Zoltan Puskas.
+
+- BUG FIX: If the first REM command to trigger was a RUN command, the banner
+  would not print.  This has been fixed.
+
+- BUG FIX: replace deprecated 'fgrep' with 'grep -F' (Jochen Sprickerhof)
+
+- BUG FIX: make "make test" depend on "make all" (Jochen Sprickerhof)
+
+- BUG FIX: make "REM ... SATISFY ... MSG foo" respect $DefaultColor.  Bug
+  reported by Gunther Reißig.
+
+- BUG FIX: Don't consider IFTRIG true if we could not compute a trigger date.
+  Bug noted by Gunther Reißig.
+
+* VERSION 4.0 Patch 3 - 2022-08-16
+
+- IMPROVEMENT: remind: add plain_body and calendar_body JSON keys in -pp...
+  output.
+
+- BUG FIX: tkremind: Don't create empty files called '&1' when creating
+  a new reminder.
+
+- BUG FIX: remind: Don't call signal-unsafe functions from signal handler
+
+* VERSION 4.0 Patch 2 - 2022-08-02
+
+- IMPROVEMENT: remind: Allow more forms of OMIT as per Ian! D. Allen's request:
+
+               OMIT Month [THROUGH Month]
+               OMIT Day Month [THROUGH Day Month]
+               OMIT Day Month Year [THROUGH Day Month Year]
+
+- BUG FIX: Make $T behave as documented, exactly like trigdate().  $T would
+  return '1989-12-31' rather than 0 if the trigger date was not valid.
+
+- BUG FIX: TkRemind: Fix resizing bug for a calendar with 6 rows.
+
+- DOCUMENTATION IMPROVEMENT: Improve TkRemind documentation; document use
+  of inotifywait if available.
+
+* VERSION 4.0 Patch 1 - 2022-06-03
+
+- IMPROVEMENT: Add $SuppressLRM system variable to suppress the UTF-8
+  Left-to-Right mark in "remind -c" output.
+
+- DOCUMENTATION FIX: Document the "q" sub-option to the "-p" option.
+
+* VERSION 4.0 Patch 0 - 2022-04-04
+
+- MAJOR NEW FEATURE: remind: Remind output can effectively be
+  translated into other languages at run-time.  A number of system
+  variables let you translate English words to another language, and a
+  mechanism for altering the substitution filter at run-time lets you
+  translate its output so the results are idiomatic.  See the man page
+  sections "RUN-TIME SUPPORT FOR OTHER LANGUAGES", "RUN-TIME
+  MODIFICATION OF THE SUBSTITUTION FILTER" and "LANGUAGE PACKS".
+
+- NEW FEATURE: remind: Add the pad() built-in function
+
+- NEW FEATURE: tkremind: Day numbers can be displayed left-aligned,
+  centered or right-aligned.
+
+- IMPROVEMENT: contrib/remind-conf-mode: The Emacs syntax-highlighter
+  has been updated with the latest system variables and functions
+  and has been made case-insensitive.
+
+- IMPROVEMENT: remind, rem2ps: Use link-time optimization with gcc if
+  possible.
+
+- IMPROVEMENT: remind: Print better diagnostics when errors occur inside
+  a user-defined function.  We now show the stack trace to make it easier
+  to figure out where the error actually is.
+
+- CHANGE: Add a "q" sub-option to the "-p", "-pp", and "-ppp" options.
+  This causes Remind *not* to remove the %"...%" marker sequence from
+  remind bodies.
+
+- BUG FIX: rem2pdf: Make rem2pdf respect the --prefix ./configure flag.
+  Loosely based on patch by Jonathan Kamens.
+
+- BUG FIX: tkremind: Fix the "-m" flag, which was broken in 03.04.00.
+
+- BUG FIX: Fix the overflow-detection functions so they work with link-time
+  optimization.  The previous versions would be optimized away.
+
+- BUG FIX: Warn if the arguments to the "-@" option are out of range.
+  Problem noted by Ian! D. Allen.
+
+- BUG FIX: Always interpret $Latitude and $Longitude input values in the
+  "C" locale.  (We do accept localized input, but warn.)
+
+- BUG FIX: Fix many spelling mistakes caught by Jens Schleusener
+
 * VERSION 3.4 Patch 2 - 2022-03-14
 
 - NEW FEATURE: remind: Add syntactic sugar to simplify some common
@@ -988,7 +1264,7 @@ CHANGES TO REMIND
 - Fixed dates for Yom Hazikaron and Yom Ha'atzmaut if 5 Iyar falls on a
   Saturday.  (Hebrew calendar fix.)
 
-- Added support for the Icelandic language, courtesy of Björn Davíðsson.
+- Added support for the Icelandic language, courtesy of Björn Davíðsson.
 
 + BUG FIXES
 
@@ -1135,7 +1411,7 @@ CHANGES TO REMIND
 - Made parser _very_ forgiving -- the type of reminder now defaults
   to MSG.  This lets you have lines in the reminder file like this:
 
-	Feb 9, 1998 Meeting with Joe.
+        Feb 9, 1998 Meeting with Joe.
 
   But I don't recommend abusing it.  It's mostly to ease migration from
   UNIX calendar(1) files.
@@ -1665,7 +1941,7 @@ CHANGES TO REMIND
   of Mikko Silvonen.
 
 - Changed the date conversion routines to greatly speed up conversion from
-  Julian to yyyy/mm/dd form.
+  Days-since-epoch to yyyy/mm/dd form.
 
 + BUG FIXES:
 
@@ -1726,7 +2002,7 @@ CHANGES TO REMIND
 
 - Removed identifiers in the C source beginning with "_" to conform
   to ANSI practice.
-  
+
 - Fixed a bug in the -u option which resulted in environment variables
   SHELL and USER not being set correctly.  Also made -u set the LOGNAME
   environment variable.
@@ -1799,7 +2075,7 @@ CHANGES TO REMIND
 
 - Fixed all the source files to include "config.h" first.
 
-- Changed the way triggers are calculated so that trigger dates are 
+- Changed the way triggers are calculated so that trigger dates are
   always valid if year, month and day are specified, and there is no
   UNTIL clause.  See MAN page section "DETAILS ABOUT TRIGVALID()."
 
@@ -1941,6 +2217,3 @@ CHANGES TO REMIND
 * Version 1.0
 
 - never publicly released.
-
-
-

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("")]

examples/ansitext

@@ -0,0 +1,36 @@
+#!/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("")]%_
+
+# 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

examples/astro

@@ -0,0 +1,70 @@
+#!/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 this variable to 1 if your terminal has a dark background or 0 if
+# it: light.
+
+bg_dark=1
+
+# 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 -ibg_dark="$bg_dark" "-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)].%_
+
+IF bg_dark
+   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%_
+ENDIF
+EOF
+
+remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+SET $AddBlankLines 0
+BANNER %
+IF bg_dark
+   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
+   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%_
+
+   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 -ibg_dark="$bg_dark" "-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

examples/defs.rem

@@ -16,7 +16,8 @@
 #  "#PSSTUFF" for nifty PostScript examples				    #
 # 									    #
 # This file is part of REMIND.						    #
-# Copyright (C) 1992-2022 Dianne Skoll                                      #
+# Copyright (C) 1992-2023 Dianne Skoll                                      #
+# SPDX-License-Identifier: GPL-2.0-only
 # 									    #
 #############################################################################
 
@@ -36,7 +37,7 @@ ENDIF
 ###########################################################
 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
@@ -77,16 +78,16 @@ REM 1 MSG John's [_mo_num(11, 1984)] 'monthly' anniversary
 ############################################################################
 
 # If it falls on a Saturday, bump to previous Friday
-REM 4 July OMIT SAT SCANFROM -1 BEFORE ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed)
+REM 3 JULY SCANFROM -7 ADDOMIT SATISFY [$Tw == 5]  MSG Independence day (observed)
 
 # If it falls on a Sunday, bump to following Monday
-REM 4 July OMIT SUN SCANFROM -7 AFTER ADDOMIT SATISFY [$Td != 4] MSG Independence day (observed)
+REM 5 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Independence day (observed)
 
 # If it falls on Sat or Sun, note the actual day
-REM 4 July SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual)
+REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw == 0 || $Tw == 6] MSG Independence day (actual)
 
 # Otherwise observed and actual is on the 4th
-REM 4 July OMIT SAT SUN SKIP SCANFROM -7 ADDOMIT MSG Independence Day
+REM 4 July SCANFROM -7 ADDOMIT SATISFY [$Tw >= 1 && $Tw <= 5] MSG Independence Day
 
 ##########################################################################
 #								         #
@@ -156,7 +157,24 @@ REM Last Sunday in October ++2 UNTIL 1 Jan 2007 MSG Daylight Saving Time - %"DST
 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 First Sat in May 	MSG %"Kentucky Derby%"
 REM Second Sun in May	MSG %"Mother's Day%"

examples/remind.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Remind
 " Maintainer:	Davide Alberani <da@erlug.linux.it>
-" Last Change:	02 Nov 2015 + 13 Mar 2021 by Dianne Skoll <dianne@skoll.ca>
+" 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
 "

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-2023 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!

include/holidays/ca.rem

@@ -0,0 +1,30 @@
+# Canadian holidays
+# SPDX-License-Identifier: GPL-2.0-only
+
+OMIT 1 Jan MSG New Year's Day
+
+# This varies by province
+REM Third Monday in Feb SCANFROM -7 ADDOMIT MSG Family Day
+
+# This varies by province
+OMIT [easterdate($Uy) - 2] MSG Good Friday
+
+# This varies by province
+OMIT [easterdate($Uy) + 1] MSG Easter Monday
+
+REM Mon 18 May SCANFROM -7 ADDOMIT MSG Victoria Day
+OMIT 1 July MSG Canada Day
+
+# This varies by province
+REM First Monday in Aug SCANFROM -7 ADDOMIT MSG Civic Holiday
+
+REM First Monday in Sep SCANFROM -7 ADDOMIT MSG Labour Day
+
+REM Second Monday in Oct SCANFROM -7 ADDOMIT MSG Thanksgiving Day
+
+REM 11 November MSG Remembrance Day
+
+OMIT 25 Dec MSG Christmas
+
+OMIT 26 Dec MSG Boxing Day
+

include/holidays/fr.rem

@@ -0,0 +1,20 @@
+#
+# France Holidays
+#
+# Source: Article L3133-1
+#   https://www.legifrance.gouv.fr/codes/section_lc/LEGITEXT000006072050/LEGISCTA000006178007/2016-08-10/
+#
+
+SET easter EASTERDATE($Uy)
+
+REM Jan  1      MSG %"Jour de l'an%"
+REM [easter+1]  MSG %"Lundi de Pâques%"
+REM May  1      MSG %"Fête du Travail%"
+REM May  8      MSG %"Victoire des alliés%"
+REM [easter+39] MSG %"Jeudi de l'Ascension%"
+REM [easter+50] MSG %"Lundi de Pentecôte%"
+REM Jul 14      MSG %"Fête nationale%"
+REM Aug 15      MSG %"Assomption%"
+REM Nov  1      MSG %"La Toussaint%"
+REM Nov 11      MSG %"Armistice%"
+REM Dec 25      MSG %"Noël%"

include/holidays/gr.rem

@@ -0,0 +1,39 @@
+# Greek national holidays
+# ΑΡΓΙΕΣ (για όλους)
+
+# fixed
+REM 1 Jan MSG ΠΡΩΤΟΧΡΟΝΙΑ
+REM 6 Jan MSG ΤΑ ΦΩΤΑ/ ΘΕΟΦΑΝΕΙΑ
+REM 25 Mar MSG η 25η Μαρτίου
+REM 15 Aug MSG 15Αύγουστος
+REM 28 Oct MSG ΟΧΙ
+REM 25 Dec MSG ΧΡΙΣΤΟΥΓΕΝΝΑ
+REM 26 Dec MSG ΧΡΙΣΤΟΥΓΕΝΝΑ2
+
+REM [orthodoxeaster($Uy)+1] ΔΕΥΤΕΡΑ ΤΟΥ ΠΑΣΧΑ
+
+
+# May first is a national holiday except if Sunday, day of great week (week before easter) or Monday after easter, then
+# minister decides moving that holiday. Here is a likely  assumption of how this day might be moved.
+# Uncomment following lines to enable.
+
+set PM date($Uy,5,1)
+# IF PM>=orthodoxeaster($Uy)-7 && PM<=orthodoxeaster($Uy)+1
+# IF PM<orthodoxeaster($Uy)-3
+# REM orthodoxeaster($Uy) -8 MSG πιθανόν ΕΡΓΑΤΙΚΗ Πρωτομαγιά
+# ELSE
+# REM [plusfunc(2)] MSG πιθανόν ΕΡΓΑΤΙΚΗ Πρωτομαγιά
+# ENDIF
+# ENDIF
+# REM [PM] OMIT Sun AFTER MSG Πρωτομαγιά
+
+REM 1 May MSG Πρωτομαγιά
+# end of May 1 speculations
+
+# The following are main national holidays per custom (observed by most but not all)
+REM [orthodoxeaster($Uy)] -48 MSG Καθαρά Δευτέρα
+REM [orthodoxeaster($Uy)] -2 MSG Μεγάλη Παρασκευή
+REM [orthodoxeaster($Uy)] -1 MSG Μεγάλο Σάββατο
+REM [orthodoxeaster($Uy)+50] MSG Αγίου Πνεύματος
+
+

include/holidays/jewish.rem

@@ -0,0 +1,112 @@
+# Major Jewish Holidays
+# SPDX-License-Identifier: GPL-2.0-only
+
+# Set the variable InIsrael to 1 if you live in Israel.  Otherwise,
+# you get the Diaspora versions of Jewish holidays
+SET InIsrael value("InIsrael", 0)
+
+# Set the variable Reform to 1 if you want the Reform version of the
+# Jewish calendar.  Otherwise, you get the traditional version
+SET Reform value("Reform", 0)
+
+# Convenient function definition to save typing
+FSET _h(x, y) HEBDATE(x,y)
+FSET _h2(x, y) HEBDATE(x, y, $U-7)
+FSET _PastSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)+1)
+FSET _BackTwoFri(x, y) IIF(WKDAYNUM(_h2(x,y))!=5, _h2(x,y), _h2(x,y)-2)
+FSET _BackTwoSat(x, y) IIF(WKDAYNUM(_h2(x,y))!=6, _h2(x,y), _h2(x,y)-2)
+# Default values in case InIsrael and Reform are not set
+SET InIsrael VALUE("InIsrael", 0)
+SET Reform   VALUE("Reform", 0)
+
+[_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.
+ENDIF
+
+[_h(10, "Tishrey")] ++4 MSG %"Yom Kippur%" is %b.
+[_h(15, "Tishrey")] ++4 MSG %"Sukkot 1%" is %b.
+
+IF !InIsrael
+   [_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.
+
+IF InIsrael
+   [_h(22, "Tishrey")] ++4 MSG %"Simchat Torah%" is %b.
+ELSE
+   [_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%"
+
+# 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.
+ENDIF
+
+[_h(15, "Shvat")] ++4 MSG %"Tu B'Shvat%" is %b.
+[_h(14, "Adar A")] ++4 MSG %"Purim Katan%" is %b.
+
+# If Purim is on Sunday, then Fast of Esther is 11 Adar.
+IF WKDAYNUM(_h2(13, "Adar")) != 6
+   REM [_h2(13, "Adar")] ++4 MSG %"Fast of Esther%" is %b.
+ELSE
+   REM [_h2(11, "Adar")] ++4 MSG %"Fast of Esther%" is %b.
+ENDIF
+[_h(14, "Adar")] ++4 MSG %"Purim%" is %b.
+[_h(15, "Nisan")] ++4 MSG %"Pesach%" is %b.
+
+IF !InIsrael
+   [_h(16, "Nisan")] MSG %"Pesach 2%"
+ENDIF
+
+[_h(21, "Nisan")] MSG %"Pesach 7%"
+
+IF !InIsrael && !Reform
+   [_h(22, "Nisan")] MSG %"Pesach 8%"
+ENDIF
+
+[_h(27, "Nisan")] ++4 MSG %"Yom HaShoah%" is %b.
+[_BackTwoFri(4,  "Iyar")] ++4 MSG %"Yom HaZikaron%" is %b.
+[_BackTwoSat(5,  "Iyar")] ++4 MSG %"Yom Ha'atzmaut%" is %b.
+
+# Not sure about Reform's position on Lag B'Omer
+IF !Reform
+   [_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.
+
+IF !InIsrael && !Reform
+   [_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.
+ENDIF
+
+# Clean up
+FUNSET _h _h2 _PastSat _BackTwoFri _BackTwoSat _chan
+

include/holidays/us.rem

@@ -0,0 +1,71 @@
+# US holidays
+# This file is part of REMIND.
+# Copyright (C) 1992-2023 Dianne Skoll
+# SPDX-License-Identifier: GPL-2.0-only
+
+REM  [easterdate($Uy)-46] MSG Ash Wednesday
+REM  [easterdate($Uy)-7]  MSG Palm Sunday
+OMIT [easterdate($Uy)-2]  MSG Good Friday
+OMIT [easterdate($Uy)]    MSG %"Easter%" Sunday
+REM  [easterdate($Uy)+39] MSG Ascension Day
+REM  [easterdate($Uy)+49] MSG Pentecost
+
+# Some holidays are omitted, some are not.  You may want to change
+# which ones are omitted.
+
+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 Third Monday in Feb SCANFROM -7 ADDOMIT MSG President's Day
+REM Mar 17 MSG St. Patrick's Day
+
+# These are accurate for most places in North America
+REM MAYBE-UNCOMPUTABLE Sun November SATISFY [isdst($T) != isdst($T+1)] MSG Daylight Saving Time Ends
+REM MAYBE-UNCOMPUTABLE Sun March SATISFY [isdst($T) != isdst($T+1)] MSG Daylight Saving Time Starts
+
+REM Apr 1 MSG %"April Fool's%" 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 %"Income tax%" due
+POP-OMIT-CONTEXT
+
+REM May 5 MSG Cinco de Mayo
+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 July 4 SCANFROM -7 ADDOMIT MSG Independence Day
+REM July 3 SCANFROM -7 ADDOMIT SATISFY [$Tw == 5] MSG Independence Day (observed)
+REM July 5 SCANFROM -7 ADDOMIT SATISFY [$Tw == 1] MSG Independence Day (observed)
+
+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 / Indigenous Peoples' Day
+REM Nov 11 MSG Veterans Day
+
+REM Oct 30 MSG Mischief Night
+REM Oct 31 MSG Halloween
+
+REM Tue Nov  2 SCANFROM -7 SATISFY [($Ty % 4) == 0] MSG Election Day
+
+REM Thu 22 Nov SCANFROM -7 ADDOMIT MSG Thanksgiving Day
+
+REM Fri 23 Nov SCANFROM -7 ADDOMIT MSG Thanksgiving (cont.)
+
+REM Dec 24 MSG Christmas Eve
+OMIT Dec 25 MSG %"Christmas%" Day

include/lang/auto.rem

@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: GPL-2.0-only
+SET autolang getenv("REMIND_LANG")
+
+IF autolang == ""
+    SET autolang getenv("LC_ALL")
+ENDIF
+IF autolang == ""
+    SET autolang getenv("LANGUAGE")
+ENDIF
+IF autolang == ""
+    SET autolang getenv("LANG")
+ENDIF
+
+IF autolang != ""
+    IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 5)) + ".rem", "r") == 0
+        INCLUDE [$SysInclude]/lang/[lower(substr(autolang, 1, 5))].rem
+    ELSE
+        IF access($SysInclude + "/lang/" + lower(substr(autolang, 1, 2)) + ".rem", "r") == 0
+            INCLUDE [$SysInclude]/lang/[lower(substr(autolang, 1, 2))].rem
+        ENDIF
+    ENDIF
+ENDIF
+
+UNSET autolang

include/lang/da.rem

@@ -0,0 +1,69 @@
+# Support for the Danish language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Mogens Lynnerup.
+
+SET $Sunday "Søndag"
+SET $Monday "Mandag"
+SET $Tuesday "Tirsdag"
+SET $Wednesday "Onsdag"
+SET $Thursday "Torsdag"
+SET $Friday "Fredag"
+SET $Saturday "Lørdag"
+
+SET $January "Januar"
+SET $February "Februar"
+SET $March "Marts"
+SET $April "April"
+SET $May "Maj"
+SET $June "Juni"
+SET $July "Juli"
+SET $August "August"
+SET $September "September"
+SET $October "Oktober"
+SET $November "November"
+SET $December "December"
+
+SET $Today "i dag"
+SET $Tomorrow "i morgen"
+
+BANNER Påmindelse for %w, %d. %m, %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "siden"
+SET $Fromnow "fra nu"
+
+SET $On "på"
+
+SET $Now "nu"
+SET $At "kl."
+SET $Minute "minut"
+SET $Hour "time"
+SET $Is "er"
+SET $Was "var"
+SET $And "og"
+SET $Hplu "r"
+SET $Mplu "ter"
+
+FSET subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " om eftermiddagen", " om aftenen")
+FSET subst_ordinal(d) "."
+
+FSET subst_p(alt, d, t) iif(d==today()+1, "", "e")
+FSET zeropad(s, len) pad(s, "0", len)
+FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+
+FSET subst_bx(a, d, t)   "om " + (d-today()) + " dage"
+
+FSET subst_ex(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET subst_fx(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
+
+FSET subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d)
+FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+
+FSET subst_hx(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
+FSET subst_ix(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
+FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
+FSET subst_vx(alt, d, t) subst_gx(alt, d, t)

include/lang/de.rem

@@ -0,0 +1,89 @@
+# Support for the German language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Wolfgang Thronicke
+
+# Day names
+SET $Sunday "Sonntag"
+SET $Monday "Montag"
+SET $Tuesday "Dienstag"
+SET $Wednesday "Mittwoch"
+SET $Thursday "Donnerstag"
+SET $Friday "Freitag"
+SET $Saturday "Samstag"
+
+# Month names
+SET $January "Januar"
+SET $February "Februar"
+SET $March "März"
+SET $April "April"
+SET $May "Mai"
+SET $June "Juni"
+SET $July "Juli"
+SET $August "August"
+SET $September "September"
+SET $October "Oktober"
+SET $November "November"
+SET $December "Dezember"
+
+SET $Today "heute"
+SET $Tomorrow "morgen"
+
+# Banner
+BANNER Termine für %w, den %d. %m %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+SET $On "am"
+SET $Hplu "n"
+SET $Mplu "n"
+SET $Now "jetzt"
+SET $At "um"
+SET $Minute "Minute"
+SET $Hour "Stunde"
+SET $Is "ist"
+SET $Was "war"
+SET $And "und"
+SET $Ago "vorher"
+SET $Fromnow "von heute"
+
+FSET subst_ampm(h)      iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends")
+FSET subst_ordinal(d)   "."
+
+FSET subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+
+FSET subst_bx(a, d, t)   "in " + (d-today()) + " Tagen"
+
+FSET subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
+FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+
+FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
+FSET subst_vx(alt, d, t) subst_gx(alt, d, t)
+FSET subst_p(alt, d, t) iif(d == today()+1, "", "en")
+
+# Localization of various astronomical events
+
+# Perihelion
+SET earthseasons_Perihelion_str  "Perihel"
+
+# Vernal equinox
+SET earthseasons_EquinoxMar_str  "Frühlingsanfang"
+
+# Summer solstice
+SET earthseasons_SolsticeJun_str "Sommeranfang"
+
+# Aphelion
+SET earthseasons_Aphelion_str    "Aphel"
+
+# Autumnal Equinox
+SET earthseasons_EquinoxSep_str  "Herbstanfang"
+
+# Winter Solstice
+SET earthseasons_SolsticeDec_str "Winteranfang"
+
+# Daylight saving time starts
+SET daylightST_starts_str        "Beginn Sommerzeit"
+
+# Daylight saving time ends
+SET daylightST_ends_str          "Ende Sommerzeit"

include/lang/en.rem

@@ -0,0 +1,4 @@
+# Support for the English language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# Nothing to do for English since it is the default.

include/lang/es.rem

@@ -0,0 +1,48 @@
+# Support for the Spanish language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Rafa Couto <rafacouto@biogate.com>
+
+SET $Sunday "Domingo"
+SET $Monday "Lunes"
+SET $Tuesday "Martes"
+SET $Wednesday "Miércoles"
+SET $Thursday "Jueves"
+SET $Friday "Viernes"
+SET $Saturday "Sábado"
+
+SET $January "Enero"
+SET $February "Febrero"
+SET $March "Marzo"
+SET $April "Abril"
+SET $May "Mayo"
+SET $June "Junio"
+SET $July "Julio"
+SET $August "Agosto"
+SET $September "Septiembre"
+SET $October "Octubre"
+SET $November "Noviembre"
+SET $December "Diciembre"
+
+SET $Today "hoy"
+SET $Tomorrow "mañana"
+
+BANNER Agenda para el %w, %d%s %m, %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "hace"
+SET $Fromnow "desde hoy"
+SET $On "el día"
+SET $Now "ahora"
+SET $At "a las"
+SET $Minute "minuto"
+SET $Hour "hora"
+SET $Is "es"
+SET $Was "fue"
+SET $And "y"
+SET $Hplu "s"
+SET $Mplu "s"
+
+FSET subst_bx(a, d, t) "dentro de " + (d-today()) + " días"

include/lang/fi.rem

@@ -0,0 +1,94 @@
+# Support for the Finnish language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Mikko Silvonen
+
+SET $Sunday "sunnuntai"
+SET $Monday "maanantai"
+SET $Tuesday "tiistai"
+SET $Wednesday "keskiviikko"
+SET $Thursday "torstai"
+SET $Friday "perjantai"
+SET $Saturday "lauantai"
+
+SET $January "tammikuu"
+SET $February "helmikuu"
+SET $March "maaliskuu"
+SET $April "huhtikuu"
+SET $May "toukokuu"
+SET $June "kesäkuu"
+SET $July "heinäkuu"
+SET $August "elokuu"
+SET $September "syyskuu"
+SET $October "lokakuu"
+SET $November "marraskuu"
+SET $December "joulukuu"
+
+SET $Today "tänään"
+SET $Tomorrow "huomenna"
+
+BANNER Viestit %wna %d. %mta %y%o:
+
+SET $Am " ap."
+SET $Pm " ip."
+
+SET $ago "sitten"
+SET $Fromnow "kuluttua"
+
+SET $On "na"
+
+SET $Now "nyt"
+SET $At "klo"
+SET $Minute "minuutti"
+SET $Hour "tunti"
+SET $Is "on"
+SET $Was "oli"
+SET $And "ja"
+SET $Hplu "a"
+SET $Mplu "a"
+
+FSET zeropad(s, len) pad(s, "0", len)
+
+FSET subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(d%10)==6||(d%10)==8, ":ntena", ":ntenä")
+
+FSET subst_a_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p + " " + year(d)
+FSET subst_ax(a, d, t) iif(a, subst_a_alt(d, "", ""), subst_a_alt(d, $On, "ta"))
+
+FSET subst_bx(a, d, t) (d-today()) + " päivän kuluttua"
+FSET subst_cx(a, d, t) iif(a, wkday(d), wkday(d) + $On)
+
+FSET subst_ex(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
+FSET subst_fx(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
+
+FSET subst_g_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p
+FSET subst_gx(a, d, t) iif(a, subst_g_alt(d, "", ""), subst_g_alt(d, $On, "ta"))
+
+FSET subst_hx(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2)
+FSET subst_ix(a, d, t) zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
+
+FSET subst_j_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d)) + " " + year(d)
+FSET subst_jx(a, d, t) iif(a, subst_j_alt(d, ""), subst_j_alt(d, $On))
+
+FSET subst_k_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ordinal(day(d))
+FSET subst_kx(a, d, t) iif(a, subst_k_alt(d, ""), subst_k_alt(d, $On))
+
+FSET subst_lx(a, d, t) zeropad(year(d), 4) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2)
+FSET subst_p(a, d, t) iif(d==today()+1, "", "ä")
+FSET subst_qx(a, d, t) "n"
+
+FSET subst_u_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p + " " + year(d)
+FSET subst_ux(a, d, t) iif(a, subst_u_alt(d, "", ""), subst_u_alt(d, $On, "ta"))
+
+FSET subst_v_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p
+FSET subst_vx(a, d, t) iif(a, subst_v_alt(d, "", ""), subst_v_alt(d, $On, "ta"))
+
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst1_past(now()-t), subst1_future(t-now()))
+
+FSET subst1_past(mins) subst_hour_past(mins/60) + subst_min_past(mins%60) + $Ago
+FSET subst1_future(mins) subst_hour_future(mins/60) + subst_min_future(mins%60) + $Fromnow
+
+FSET subst_hour_past(h) iif(h==0, "", h + " " + $Hour + iif(h==1, " ", $Hplu + " "))
+FSET subst_min_past(m) iif(m==0, "", m + " " + $Minute + iif(m==1, " ", $Mplu + " "))
+FSET subst_hour_future(h) iif(h==0, "", h + " tunnin ")
+FSET subst_min_future(m) iif(m==0, "", m + " minuutin ")

include/lang/fr.rem

@@ -0,0 +1,62 @@
+# Support for the French language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Laurent Duperval
+
+SET $Sunday "dimanche"
+SET $Monday "lundi"
+SET $Tuesday "mardi"
+SET $Wednesday "mercredi"
+SET $Thursday "jeudi"
+SET $Friday "vendredi"
+SET $Saturday "samedi"
+
+SET $January "janvier"
+SET $February "février"
+SET $March "mars"
+SET $April "avril"
+SET $May "mai"
+SET $June "juin"
+SET $July "juillet"
+SET $August "août"
+SET $September "septembre"
+SET $October "octobre"
+SET $November "novembre"
+SET $December "décembre"
+
+SET $Today "aujourd'hui"
+SET $Tomorrow "demain"
+SET $On "le"
+SET $At "à"
+SET $Now "maintenant"
+SET $Minute "minute"
+SET $Hour "heure"
+SET $Is "est"
+SET $Was "était"
+SET $And "et"
+SET $Hplu "s"
+SET $Mplu "s"
+SET $Ago "il y a"
+SET $Fromnow "dans"
+
+# Banner
+BANNER Rappels pour %w, %d%s %m, %y%o:
+
+# Ordinal for a day (English would be "st", "nd", "rd", "th")
+FSET subst_ordinal(d) iif(d == 1, "er", "")
+
+# "%d hours", "%d minutes", or "%d hours and %d minutes"
+FSET subst_tdiff(hdiff, mdiff) iif(hdiff==0&&mdiff==0, $Now, \
+                                      hdiff==0,            mdiff + plural(mdiff, " minute"), \
+                                      mdiff==0,            hdiff + plural(hdiff, " heure"), \
+                                      hdiff + plural(hdiff, " heure") + " et " + mdiff + plural(mdiff, " minute"))
+FSET subst_1(alt, date, time) iif(time == now(), "maintenant", \
+                                  time > now(), "dans " + subst_tdiff((time-now())/60, (time-now())%60), \
+                                  "il y a " + subst_tdiff ((now()-time)/60, (now()-time)%60))
+
+FSET subst_bx(alt, date, time) "dans " + (date-today()) + " jours"
+FSET subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date)
+FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date))
+
+FSET subst_k_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date)
+FSET subst_kx(alt, date, time) iif(alt, subst_k_alt(date), $On + " " + subst_k_alt(date))

include/lang/gr.rem

@@ -0,0 +1,83 @@
+# Support for the Hellenic (Greek) language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by jarlaxl lamat (jarlaxl@freemail.gr)
+
+SET $Sunday "Κυριακή"
+SET $Monday "Δευτέρα"
+SET $Tuesday "Τρίτη"
+SET $Wednesday "Τετάρτη"
+SET $Thursday "Πέμπτη"
+SET $Friday "Παρασκευή"
+SET $Saturday "Σάββατο"
+
+SET $January "Ιανουάρ."
+SET $February "Φεβρουάρ."
+SET $March "Μάρτ."
+SET $April "Απρίλ."
+SET $May "Μαι."
+SET $June "Ιούν."
+SET $July "Ιούλ."
+SET $August "Αυγουστ."
+SET $September "Σεπτέμβρ."
+SET $October "Οκτώβρ."
+SET $November "Νοέμβρ."
+SET $December "Δεκέμβρ."
+
+SET $Today "σήμερα"
+SET $Tomorrow "αύριο"
+
+BANNER Υπενθυμίσεις: %w, %d %m, %y%o:
+
+SET $Am "πμ"
+SET $Pm "μμ"
+
+SET $Ago "πριν"
+SET $Fromnow "από τώρα"
+
+SET $On "την"
+
+SET $Now "τώρα"
+SET $At "στις"
+SET $Minute "λεπτά"
+SET $Hour "ώρες"
+SET $Is "είναι"
+SET $Was "ήταν"
+SET $And "και"
+SET $Hplu ""
+SET $Mplu ""
+
+FSET subst_bx(a, d, t) "σε " + (d - today()) + " ημέρες"
+FSET subst_ordinal(d)   "."
+FSET subst_a_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
+FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET subst_g_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d)
+FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET subst_ux(alt, d, t) subst_ax(alt, d, t)
+FSET subst_vx(alt, d, t) subst_gx(alt, d, t)
+
+# Localization of various astronomical events
+
+# Perihelion
+SET earthseasons_Perihelion_str  "Περιήλιον"
+
+# Vernal equinox
+SET earthseasons_EquinoxMar_str  "Εαρινή ισημερία"
+
+# Summer solstice
+SET earthseasons_SolsticeJun_str "Θερινό ηλιοστάσιο"
+
+# Aphelion
+SET earthseasons_Aphelion_str    "Αφήλιον"
+
+# Autumnal Equinox
+SET earthseasons_EquinoxSep_str  "Φθινοπωρινή ισημερία"
+
+# Winter Solstice
+SET earthseasons_SolsticeDec_str "Χειμερινό ηλιοστάσιο"
+
+# Daylight saving time starts
+SET daylightST_starts_str        "Έναρξη θέρους"
+
+# Daylight saving time ends
+SET daylightST_ends_str          "Τέλος θέρους"

include/lang/is.rem

@@ -0,0 +1,51 @@
+# Support for the Icelanding language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Björn Davíðsson (bjossi@snerpa.is)
+
+SET $Sunday "sunnudagur"
+SET $Monday "mánudagur"
+SET $Tuesday "þriðjudagur"
+SET $Wednesday "miðvikudagur"
+SET $Thursday "fimmtudagur"
+SET $Friday "föstudagur"
+SET $Saturday "laugardagur"
+
+SET $January "janúar"
+SET $February "febrúar"
+SET $March "mars"
+SET $April "apríl"
+SET $May "maí"
+SET $June "júní"
+SET $July "júlí"
+SET $August "ágúst"
+SET $September "september"
+SET $October "október"
+SET $November "nóvember"
+SET $December "desember"
+
+SET $Today "í dag"
+SET $Tomorrow "á morgun"
+
+BANNER Minnisatriði: %w, %d%s %m, %y%o:
+
+SET $Am "fh"
+SET $Pm "eh"
+
+SET $Ago "síðan"
+SET $Fromnow "frá því nú"
+
+SET $On "þann"
+
+SET $Now "núna"
+SET $At "kl."
+SET $Minute "mínútu"
+SET $Hour "klukkustund"
+SET $Is "er"
+SET $Was "var"
+SET $And "og"
+SET $Hplu "ir"
+SET $Mplu "r"
+
+FSET subst_bx(a, d, t) "eftir " + (d - today()) + " daga"
+fset subst_p(a, d, t) iif(d == today()+1, "", "a")

include/lang/it.rem

@@ -0,0 +1,67 @@
+# Support for the Italian language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Valerio Aimale
+
+SET $Sunday "Domenica"
+SET $Monday "Lunedí"
+SET $Tuesday "Martedí"
+SET $Wednesday "Mercoledí"
+SET $Thursday "Giovedí"
+SET $Friday "Venerdí"
+SET $Saturday "Sabato"
+
+SET $January "Gennaio"
+SET $February "Febbraio"
+SET $March "Marzo"
+SET $April "Aprile"
+SET $May "Maggio"
+SET $June "Giugno"
+SET $July "Luglio"
+SET $August "Agosto"
+SET $September "Settembre"
+SET $October "Ottobre"
+SET $November "Novembre"
+SET $December "Dicembre"
+
+SET $Today "oggi"
+SET $Tomorrow "domani"
+
+BANNER Promemoria per %w, %d %m %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "fa"
+SET $Fromnow "da oggi"
+
+SET $On ""
+SET $Now "ora"
+SET $At "alle"
+SET $Minute "minuto"
+SET $Hour "ora"
+SET $Is "é"
+SET $Was "era"
+SET $And "e"
+SET $Hplu "a"
+SET $Mplu "i"
+
+FSET subst_bx(a, d, t) "fra " + (d-today()) + " giorni"
+FSET subst_p(a, d, t) iif(d==today()+1, "o", "i")
+FSET subst_q(a, d, t) iif(d==today()+1, "a", "e")
+
+FSET subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
+FSET subst_jx(a, d, t) subst_ax(a, d, t)
+FSET subst_kx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET subst_ux(a, d, t) subst_ax(a, d, t)
+FSET subst_vx(a, d, t) subst_kx(a, d, t)
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
+FSET subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
+
+FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
+FSET subst_minutes(m) iif(m==1, "1 minuto", m + " minuti")
+FSET subst_hours(h) iif(h==1, "1 ora", h + " ore")
+
+FSET subst_0(a, d, t) iif(abs(now()-t)/60==1, "a", "e")
+FSET subst_9(a, d, t) iif(abs(now()-t)%60==1, "o", "i")

include/lang/nl.rem

@@ -0,0 +1,56 @@
+# Support for the Dutch language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Willem Kasdorp and Erik-Jan Vens
+
+SET $Sunday "zondag"
+SET $Monday "maandag"
+SET $Tuesday "dinsdag"
+SET $Wednesday "woensdag"
+SET $Thursday "donderdag"
+SET $Friday "vrijdag"
+SET $Saturday "zaterdag"
+
+SET $January "januari"
+SET $February "februari"
+SET $March "maart"
+SET $April "april"
+SET $May "mei"
+SET $June "juni"
+SET $July "juli"
+SET $August "augustus"
+SET $September "september"
+SET $October "oktober"
+SET $November "november"
+SET $December "december"
+
+SET $Today "vandaag"
+SET $Tomorrow "morgen"
+
+BANNER Herinneringen voor %w, %d%s %m, %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "geleden"
+SET $Fromnow "vanaf nu"
+SET $On "op"
+
+SET $Now "nu"
+SET $At "op"
+SET $Minute "minuut"
+SET $Hour "uur"
+SET $Is "is"
+SET $Was "was"
+SET $And "en"
+SET $Hplu "en"
+SET $Mplu "en"
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1a(now()-t, $Ago), subst_1a(t-now(), $Fromnow))
+FSET subst_1a(diff, when) subst_1b(diff/60, diff%60) + " " + when
+
+FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_hours(hdiff), subst_hours(hdiff) + " " + $And + " " + subst_minutes(mdiff))
+FSET subst_minutes(m) iif(m==1, "1 minuut", m + " minuten")
+FSET subst_hours(h) iif(h==1, "1 uur", h + " uren")
+
+FSET subst_bx(a, d, t) "over " + (d-today()) + " dagen"

include/lang/no.rem

@@ -0,0 +1,58 @@
+# Support for the Norwegian language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Trygve Randen
+
+SET $Sunday "Søndag"
+SET $Monday "Mandag"
+SET $Tuesday "Tirsdag"
+SET $Wednesday "Onsdag"
+SET $Thursday "Torsdag"
+SET $Friday "Fredag"
+SET $Saturday "Lørdag"
+
+SET $January "Januar"
+SET $February "Februar"
+SET $March "Mars"
+SET $April "April"
+SET $May "Mai"
+SET $June "Juni"
+SET $July "Juli"
+SET $August "August"
+SET $September "September"
+SET $October "Oktober"
+SET $November "November"
+SET $December "Desember"
+
+SET $Today "i dag"
+SET $Tomorrow "i morgen"
+
+BANNER Påminnelse for %w, %d. %m, %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "siden"
+SET $Fromnow "fra nå"
+
+SET $On "den"
+SET $Now "nå"
+SET $At "kl."
+SET $Minute "minutt"
+SET $Hour "time"
+SET $Is "er"
+SET $Was "var"
+SET $And "og"
+SET $Hplu "r"
+SET $Mplu "er"
+
+FSET subst_bx(a, d, t) "om " + (d-today()) + " dager"
+FSET subst_ordinal(d) "."
+
+FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
+FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d)
+FSET subst_ux(a, d, t) subst_ax(a, d, t)
+FSET subst_vx(a, d, t) subst_gx(a, d, t)
+FSET subst_p(a, d, t) iif(d==today()+1, "", "er")

include/lang/pl.rem

@@ -0,0 +1,69 @@
+# Support for the Polish language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Jerzy Sobczyk
+
+SET $Sunday "Niedziela"
+SET $Monday "Poniedziałek"
+SET $Tuesday "Wtorek"
+SET $Wednesday "Środa"
+SET $Thursday "Czwartek"
+SET $Friday "Piątek"
+SET $Saturday "Sobota"
+
+SET $January "Styczeń"
+SET $February "Luty"
+SET $March "Marzec"
+SET $April "Kwiecień"
+SET $May "Maj"
+SET $June "Czerwiec"
+SET $July "Lipiec"
+SET $August "Sierpień"
+SET $September "Wrzesień"
+SET $October "Październik"
+SET $November "Listopad"
+SET $December "Grudzień"
+
+SET $Today "dzisiaj"
+SET $Tomorrow "jutro"
+
+BANNER Terminarz na %w, %d. %m %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "temu"
+SET $Fromnow "od teraz"
+SET $On "-"
+SET $Now "teraz"
+SET $At "o"
+SET $Minute "minut"
+SET $Hour "godzin"
+SET $Is "będzie"
+SET $Was "było"
+SET $And "i"
+SET $Hplu ""
+SET $Mplu ""
+
+FSET subst_pl_plu(n) iif(n==1, "ę", (n==12||n==13||n==14), "", (n%10==2||n%10==3||n%10==4), "y", "")
+FSET subst_ampm(h) iif(h<5, " w nocy", h<10, " rano", h<12, " przed południem", h<18, " po południu", h<22, " wieczorem", " w nocy")
+FSET subst_ordinal(d) ""
+
+FSET subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
+FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
+FSET subst_bx(a, d, t) "za " + (d-today()) + " dni"
+FSET subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d)
+FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
+FSET subst_ux(a, d, t) subst_ax(a, d, t)
+FSET subst_vx(a, d, t) subst_gx(a, d, t)
+FSET subst_p(a, d, t) ""
+FSET subst_0(a, d, t) subst_pl_plu(abs(t-now())/60)
+FSET subst_9(a, d, t) subst_pl_plu(abs(t-now())%60)
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1past(now()-t), subst_1future(t-now()))
+
+FSET subst_1future(diff) "za " + iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60))
+FSET subst_1past(diff) iif(diff/60==0, subst_1min(diff%60), diff%60==0, subst_1h(diff/60), subst_1h(diff/60) + " " + $And + " " + subst_1min(diff%60)) + " temu"
+
+FSET subst_1min(m) m + " " + $Minute + subst_pl_plu(m)
+FSET subst_1h(h) h + " " + $Hour + subst_pl_plu(h)

include/lang/pt.rem

@@ -0,0 +1,69 @@
+# Support for the (Brazilian) Portuguese language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Marco Paganini
+
+SET $Sunday "domingo"
+SET $Monday "segunda"
+SET $Tuesday "terça"
+SET $Wednesday "quarta"
+SET $Thursday "quinta"
+SET $Friday "sexta"
+SET $Saturday "sábado"
+
+SET $January "janeiro"
+SET $February "fevereiro"
+SET $March "março"
+SET $April "abril"
+SET $May "maio"
+SET $June "junho"
+SET $July "julho"
+SET $August "agosto"
+SET $September "setembro"
+SET $October "outubro"
+SET $November "novembro"
+SET $December "dezembro"
+
+SET $Today "hoje"
+SET $Tomorrow "amanhã"
+
+BANNER Avisos para %w, %d de %m de %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "atrás"
+SET $Fromnow "adiante"
+
+SET $On "em"
+SET $Now "agora"
+SET $At "as"
+SET $Minute "minuto"
+SET $Hour "hora"
+SET $Is "é"
+SET $Was "foi"
+SET $And "e"
+
+SET $Hplu "s"
+SET $Mplu "s"
+
+FSET subst_ordinal(d) ""
+FSET subst_on_wd(d) iif(wkdaynum(d) == 1 || wkdaynum(d) == 2, "no", "na")
+
+FSET subst_a_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d) + " de " + year(d)
+FSET subst_bx(a, d, t) "em " + (d-today()) + " dias"
+FSET subst_c_alt(d) wkday(d)
+FSET subst_g_alt(d) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), subst_on_wd(d) + " " + subst_a_alt(d))
+FSET subst_cx(a, d, t) iif(a, subst_c_alt(d), subst_on_wd(d) + " " + subst_c_alt(d))
+FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), subst_on_wd(d) + " " + subst_g_alt(d))
+FSET subst_jx(a, d, t) subst_ax(a, d, t)
+FSET subst_k_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d)
+FSET subst_kx(a, d, t) iif(a, subst_k_alt(d), subst_on_wd(d) + " " + subst_k_alt(d))
+FSET subst_ux(a, d, t) subst_ax(a, d, t)
+FSET subst_vx(a, d, t) subst_kx(a, d, t)
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t>now(), "em " + subst_1help(t-now()), subst_1help(now()-t) + " " + $Ago)
+FSET subst_1help(diff) iif(diff/60==0, subst_mplu(diff%60), diff%60==0, subst_hplu(diff/60), subst_hplu(diff/60) + " " + $And + " " + subst_mplu(diff%60))
+FSET subst_mplu(m) iif(m==1, "1 " + $Minute, m + " " + $Minute + $Mplu)
+FSET subst_hplu(h) iif(h==1, "1 " + $Hour, h + " " + $Hour + $Hplu)

include/lang/ro.rem

@@ -0,0 +1,68 @@
+# Support for the Romanian language.
+# This file is part of REMIND.
+# REMIND is Copyright (C) 1992-2023 by Dianne Skoll
+# This file is derived from a translation by Liviu Daia
+
+SET $Sunday "Duminică"
+SET $Monday "Luni"
+SET $Tuesday "Marți"
+SET $Wednesday "Miercuri"
+SET $Thursday "Joi"
+SET $Friday "Vineri"
+SET $Saturday "Sâmbătă"
+
+SET $January "Ianuarie"
+SET $February "Februarie"
+SET $March "Martie"
+SET $April "Aprilie"
+SET $May "Mai"
+SET $June "Iunie"
+SET $July "Iulie"
+SET $August "August"
+SET $September "Septembrie"
+SET $October "Octombrie"
+SET $November "Noiembrie"
+SET $December "Decembrie"
+
+SET $Today "astăzi"
+SET $Tomorrow "mâine"
+
+BANNER Reamintiri pentru %w, %d %m %y%o:
+
+SET $Am "am"
+SET $Pm "pm"
+
+SET $Ago "acum"
+SET $Fromnow "peste"
+
+SET $On "pe"
+
+SET $Now "acum"
+SET $At "la ora"
+SET $Minute "minut"
+SET $Hour "or"
+SET $Is "este"
+SET $Was "a fost"
+SET $Mplu "e"
+SET $Hplu "e"
+SET $And "şi"
+
+FSET subst_bx(a, d, t) "peste " + (d-today()) + " zile"
+
+FSET subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara")
+FSET subst_ordinal(d) ""
+
+FSET subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d)
+FSET subst_cx(a, d, t) wkday(d)
+FSET subst_gx(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d)
+FSET subst_jx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d) + ", " + year(d)
+FSET subst_kx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d)
+FSET subst_ux(a, d, t) subst_ax(a, d, t)
+FSET subst_vx(a, d, t) subst_gx(a, d, t)
+FSET subst_p(a, d, t) iif(d==today()+1, "", "le")
+
+FSET subst_1(a, d, t) iif(t==now(), $Now, t<now(), subst_1helper(now()-t, "acum "), subst_1helper(t-now(), "peste "))
+FSET subst_1helper(diff, when) when + iif(diff%60==0, subst_1h(diff/60), diff/60==0, subst_1m(diff%60), subst_1h(diff/60) + " " + $And + " " + subst_1m(diff%60))
+FSET subst_1h(h) iif(h==1, "1 oră", h + " ore")
+FSET subst_1m(m) iif(m==1, "1 minut", m + " minute")
+FSET subst_0(a, d, t) iif(abs(t-now())/60==1, "ă", "e")

include/seasons.rem

@@ -0,0 +1,16 @@
+# Equinoxes and solstices
+# SPDX-License-Identifier: GPL-2.0-only
+
+IF $LatDeg >= 0
+    # Northern Hemisphere
+    REM NOQUEUE [soleq(0)] MSG %"Vernal Equinox%" is %3.
+    REM NOQUEUE [soleq(1)] MSG %"Summer Solstice%" is %3.
+    REM NOQUEUE [soleq(2)] MSG %"Autumnal Equinox%" is %3.
+    REM NOQUEUE [soleq(3)] MSG %"Winter Solstice%" is %3.
+ELSE
+    # Southern Hemisphere
+    REM NOQUEUE [soleq(0)] MSG %"Autumnal Equinox%" is %3.
+    REM NOQUEUE [soleq(1)] MSG %"Winter Solstice%" is %3.
+    REM NOQUEUE [soleq(2)] MSG %"Vernal Equinox%" is %3.
+    REM NOQUEUE [soleq(3)] MSG %"Summer Solstice%" is %3.
+ENDIF

include/site/README

@@ -0,0 +1,2 @@
+This directory is for system administrators to install site-wide
+Remind scripts that are useful to their user-base.

man/rem.1.in

@@ -1,4 +1,4 @@
-.TH REM 1 "1 January 2021"
+.TH REM 1 "@RELEASE_DATE@" "User Commands" "VERSION @VERSION@"
 .UC 4
 .SH NAME
 rem \- Invoke Remind with a default filename
@@ -16,5 +16,7 @@ the filename $HOME/.reminders
 .PP
 .SH AUTHOR
 Remind was written by Dianne Skoll <dianne@skoll.ca>
+.SH HOME PAGE
+https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
 \fBremind\fR

man/rem2ps.1.in

@@ -1,4 +1,4 @@
-.TH REM2PS 1 "5 January 2021"
+.TH REM2PS 1 "@RELEASE_DATE@" "User Commands" "VERSION @VERSION@"
 .UC 4
 .SH NAME
 rem2ps \- draw a PostScript calendar from Remind output
@@ -586,6 +586,18 @@ For a SHADE or COLOR special, the blue color component.
 .B body \fIbody\fR
 The body of the reminder to issue.  Always present.
 .TP
+.B calendar_body \fIbody\fR
+The text appropriate to include in a calendar.  Only present if the
+original body contains %"...%" sequences and the "q" modifier was used
+with Remind's "-pp..." flag.
+.TP
+.B plain_body \fIbody\fR
+The "plain" body of the reminder with any %"...%" sequences removed.
+If your back-end is designed to draw a calendar, then it should
+use the \fBcalendar_body\fR if present.  If not, then it
+should use the \fBplain_body\fR if present, and if not, then it
+should fall back on the \fBbody\fR.
+.TP
 .B rawbody \fIraw\fR
 The "raw" body of the reminder, before any expression-pasting or
 substitution-sequence processing.  If the raw body would be the same
@@ -674,6 +686,8 @@ resulting PostScript output will probably not work.
 You should ensure that the values you supply for margin widths are sensible.
 If they are too big for the media size, \fBRem2ps\fR will not complain,
 but again, the PostScript output will probably not work.
+.SH HOME PAGE
+https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
 \fBremind\fR, \fBrem2pdf\fR, \fBrem2html\fR, \fBtkremind\fR.
 

man/tkremind.1.in

@@ -1,4 +1,4 @@
-.TH TKREMIND 1 "15 January 2021"
+.TH TKREMIND 1 "@RELEASE_DATE@" "User Commands" "VERSION @VERSION@"
 .UC 4
 .SH NAME
 tkremind \- graphical front-end to Remind calendar program
@@ -18,13 +18,13 @@ as well as the tcllib extension.  It also requires a \fBwish\fR
 binary.  If you are using Tcl/Tk 8.5, you may also need either the Img
 or the tkpng extension to handle PNG images.
 
-.SH OPTIONS
-\fBTkRemind\fR itself has no options.  However, it passes certain options
-on to \fBRemind\fR.  The options it passes are
-\fB\-b\fR, \fB\-g\fR, \fB\-x\fR, \fB\-i\fR and \fB\-m\fR.
-See the \fBRemind\fR man page for details about the options.
-Note that \fBTkRemind\fR will respect the \fB\-m\fR and
-\fB\-b1\fR options and adjust its appearance accordingly.
+.SH COMMAND-LINE OPTIONS
+\fBTkRemind\fR itself has no command-line options.  However, it passes
+certain options on to \fBRemind\fR.  The options it passes are
+\fB\-b\fR, \fB\-g\fR, \fB\-x\fR, \fB\-i\fR and \fB\-m\fR.  See the
+\fBRemind\fR man page for details about the options.  Note that
+\fBTkRemind\fR will respect the \fB\-m\fR and \fB\-b1\fR options and
+adjust its appearance accordingly.
 
 \fIRead_file\fR is the file from which \fBTkRemind\fR reads reminders.
 It is in standard \fBRemind\fR format.  \fIWrite_file\fR is the file
@@ -44,8 +44,14 @@ include the line:
 .PP
 
 \fIConfig_file\fR is the file in which \fBTkRemind\fR stores
-its options.  If it is omitted, it defaults to \fI$HOME/.tkremindrt\fR.
+its options.  If it is omitted, it defaults to \fI$HOME/.config/tkremindrc\fR.
 
+.PP
+If \fB$HOME/.reminders\fR is a \fIdirectory\fR, then \fBTkRemind\fR defaults to
+reading \fB$HOME/.reminders\fR and writing new reminders to
+\fB$HOME/.reminders/100-tkremind.rem\fR.  If you want to keep your
+reminders in a directory \fB$HOME/.reminders\fR, you should create that
+directory before starting \fBTkRemind\fR.
 .SH THE CALENDAR WINDOW
 When you start \fBTkRemind\fR, it displays a calendar for the current
 month, with today's date highlighted.  Reminders are filled into each
@@ -274,7 +280,7 @@ Similar to Change entry font, but applies to calendar heading
 .PP
 Once you've configured the options the way you like them,
 press \fBApply Options\fR to put them into effect, \fBSave Options\fR
-to put them into effect and save them in $HOME/.tkremindrc, or
+to put them into effect and save them in $HOME/.config/tkremindrc, or
 \fBCancel\fR to cancel any changes you made.
 
 .SH KEYBOARD SHORTCUTS
@@ -293,6 +299,19 @@ Next Month
 .B Home
 Today
 
+.SH IMMEDIATE UPDATES
+
+If you are running \fBTkRemind\fR on Linux and have the
+\fBinotifywait\fR program installed (part of the \fBinotify-tools\fR
+or similar package), then \fBTkRemind\fR redraws the calendar window
+\fIimmediately\fR if \fB$HOME/.reminders\fR changes (or, if it is a
+directory, any files in that directory change.)
+.PP
+This lets \fBTkRemind\fR react immediately to hand-edited reminders or
+to reminder files that are imported from another calendar system (for example,
+you may have a cron job that periodically imports your Google Calendar
+entries into Remind format.)
+
 .SH ODDS AND ENDS
 \fBTkRemind\fR performs some basic consistency checks when you add or
 preview a reminder.  However, if you edit a reminder in the previewer,
@@ -323,8 +342,7 @@ You can use this to activate certain reminders in different ways
 for \fBTkRemind\fR (for example).
 .PP
 \fBTkRemind\fR uses tags to keep track of reminders in the
-script file.  It also places special comments in the reminder
-file to store additional state.  You can certainly mix
+script file. You can certainly mix
 "hand-crafted" reminders with reminders created by \fBTkRemind\fR
 if you are aware of the following rules and limitations:
 .TP
@@ -334,15 +352,16 @@ where \fInnn\fR is a number.  You should not use such \fBTAG\fRs
 in hand-crafted reminders.
 .TP
 o
-Do not edit lines starting with "# TKTAGnnn", "# TKEND", or any
-lines in between.  You can move such lines, but be careful to move
-them as a single block.
-.TP
-o
 Hand-crafted reminders cannot be edited with \fBTkRemind\fR, and
 for hand-crafted timed reminders, you will not be presented with
 the "Don't remind me again" option when they pop up.
 
+.PP
+However, rather than mixing hand-edited files with \fBTkRemind\fR-generated
+ones, it is better to make \fB$HOME/.reminders\fR a directory and keep
+your hand-edited files in a separate \fB*.rem\fR file than \fBTkRemind\fR's
+\fB100-tkremind.rem\fR file.
+
 .SH SERVER MODE
 
 \fBRemind\fR has a special mode for interacting with programs like
@@ -400,14 +419,16 @@ This line is emitted in response to a \fBSTATUS\fR command.  The number
 .SH AUTHOR
 TkRemind was written by Dianne Skoll <dianne@skoll.ca>
 
-\fBTkRemind\fR is Copyright 1996-2020 by Dianne Skoll.
+\fBTkRemind\fR is Copyright 1996-2023 by Dianne Skoll.
 
 .SH FILES
 
-$HOME/.reminders -- default reminder file.
+$HOME/.reminders -- default reminder file or directory.
 
-$HOME/.tkremindrc -- \fBTkRemind\fR saved options.
+$HOME/.config/tkremindrc -- \fBTkRemind\fR saved options.
 
+.SH HOME PAGE
+https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
 \fBremind\fR, \fBrem2ps\fR, \fBrem2pdf\fR, \fBrem2html\fR
 

rem2html/Makefile.in

@@ -19,7 +19,7 @@ install:
 	    $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
 	    if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
 	done; \
-	pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 || true; \
+	pod2man --center "VERSION @VERSION@" --date "@RELEASE_DATE@" rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 || true; \
 	echo "Installing rem2html in $(DESTDIR)$(bindir)"; \
 	mkdir -p $(DESTDIR)$(bindir) && sed -e 's|^#!perl|#!$(PERL)|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \
 	exit 1;

rem2html/rem2html

@@ -1,4 +1,5 @@
 #!perl
+# SPDX-License-Identifier: GPL-2.0-only
 
 use strict;
 use warnings;
@@ -130,6 +131,10 @@ today's date, add the following reminder to your reminders file:
 rem2html was written by Dianne Skoll with much inspiration from an
 earlier version by Don Schwarz.
 
+=head1 HOME PAGE
+
+L<https://dianne.skoll.ca/projects/remind/>
+
 =head1 SEE ALSO
 
 B<remind>, B<rem2ps>, B<rem2pdf>, B<tkremind>

rem2pdf/Makefile.PL.in

@@ -1,4 +1,15 @@
 use ExtUtils::MakeMaker;
+{
+        # Override pod2man options
+        package MY;
+        sub manifypods {
+                my ($self,%attribs) = @_;
+                my $result = $self->SUPER::manifypods(%attribs);
+                $result =~ s/^(POD2MAN_EXE\s*=\s*)(.+)$/$1$2 --center 'VERSION @VERSION@' --date '@RELEASE_DATE@'/m;
+                return $result;
+        }
+}
+
 WriteMakefile(
 	NAME               => 'Remind::PDF',
 	AUTHOR             => q{Dianne Skoll <dianne@skoll.ca>},

rem2pdf/Makefile.top.in

@@ -33,10 +33,16 @@ install:
                 $(MAKE) install DESTDIR=$(DESTDIR) "INSTALL_BASE=$(INSTALL_BASE)" && exit 0; \
         elif test "$(prefix)" = "/usr" ; then \
 		$(MAKE) install DESTDIR=$(DESTDIR) INSTALLDIRS=vendor && exit 0; \
-        else \
+        elif test "$(prefix)" = "/usr/local" ; then \
 		$(MAKE) install DESTDIR=$(DESTDIR) && exit 0; \
+        else \
+		$(MAKE) install DESTDIR=$(DESTDIR) "INSTALL_BASE=$(prefix)" && exit 0; \
         fi; \
 	exit 1;
 
 Makefile: Makefile.PL
-	$(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(INSTALL_BASE) || true
+	if test "$(prefix)" != "/usr" -a "$(prefix)" != "/usr/local" -a "$(INSTALL_BASE)" = "" ; then \
+		$(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(prefix) || true;\
+	else \
+		$(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(INSTALL_BASE) || true;\
+	fi

rem2pdf/bin/rem2pdf.in

@@ -1,6 +1,8 @@
 #!@PERL@
+# SPDX-License-Identifier: GPL-2.0-only
 use strict;
 use warnings;
+use lib '@prefix@/lib/perl5';
 
 use Encode;
 use Cairo;
@@ -442,14 +444,14 @@ B<-p>, B<-pp> or B<-ppp> options into B<rem2pdf>.  The PDF output
 will be sent to standard output.  So for example, to print a 12-month
 calendar for the year 2030, use:
 
-  remind -pp12 /dev/null Jan 2030 | rem2pdf -e -l -c=3 | lpr
+  remind -pp12 /dev/null Jan 2030 | rem2pdf -e -l -c3 | lpr
 
 You can concatenate multiple B<remind> runs.  For example, the following
 will produce a PDF calendar for January through March of 2023, and
 June of 2023 (for a total of four pages);
 
-  (remind -pp3 Jan 2023 /dev/null ; \
-   remind -p June 2023 /dev/null) | rem2pdf -e -l -c=3 > cal.pdf
+  (remind -pp3 /dev/null Jan 2023 ; \
+   remind -pp /dev/null June 2023) | rem2pdf -e -l -c3 > cal.pdf
 
 =head1 FORMATTED TEXT
 
@@ -503,6 +505,10 @@ of each calendar box:
 
 B<Rem2PDF> was written by Dianne Skoll <dianne@skoll.ca>
 
+=head1 HOME PAGE
+
+L<https://dianne.skoll.ca/projects/remind/>
+
 =head1 SEE ALSO
 
 B<remind>, B<rem2ps>, B<rem2html>, B<tkremind>

rem2pdf/lib/Remind/PDF.pm

@@ -1,4 +1,5 @@
 package Remind::PDF;
+# SPDX-License-Identifier: GPL-2.0-only
 use strict;
 use warnings;
 
@@ -227,14 +228,16 @@ sub parse_oldstyle_line
 
         if ($hash->{passthru}) {
                 if ($hash->{passthru} =~ /^(shade|color|colour)$/i) {
-                        if ($hash->{body} =~ /^\s*(\d+)\s+(\d+)\s+(\d+)/) {
+                        if ($hash->{body} =~ /^\s*(\d+)\s+(\d+)\s+(\d+)\s*(.*)/) {
                                 $hash->{r} = $1;
                                 $hash->{g} = $2;
                                 $hash->{b} = $3;
-                        } elsif ($hash->{body} =~ /^\s*(\d+)/) {
+                                $hash->{body} = $4;
+                        } elsif ($hash->{body} =~ /^\s*(\d+)\s*(.*)/) {
                                 $hash->{r} = $1;
                                 $hash->{g} = $1;
                                 $hash->{b} = $1;
+                                $hash->{body} = $2;
                         }
                 }
         }
@@ -285,7 +288,7 @@ sub read_one_month_pp
 Given a hashref C<$hash> consisting of one entry parsed
 from the "remind -p" stream and a C<$specials_accepted> hash,
 return 1 if we should include this entry in the calendar or
-0 if mot.
+0 if not.
 
 =cut
 sub accept_special

rem2pdf/lib/Remind/PDF/Entry.pm

@@ -1,4 +1,5 @@
 package Remind::PDF::Entry;
+# SPDX-License-Identifier: GPL-2.0-only
 use strict;
 use warnings;
 
@@ -76,7 +77,15 @@ sub render
 
         $layout->set_width(1024 * ($x2 - $x1 - 2 * $settings->{border_size}));
         $layout->set_wrap('word-char');
-        $layout->set_text(Encode::decode('UTF-8', $self->{body}));
+        my $body;
+        if (exists($self->{calendar_body})) {
+                $body = $self->{calendar_body};
+        } elsif (exists($self->{plain_body})) {
+                $body = $self->{plain_body};
+        } else {
+                $body = $self->{body};
+        }
+        $layout->set_text(Encode::decode('UTF-8', $body));
         my $desc = Pango::FontDescription->from_string($settings->{entry_font} . ' ' . $settings->{entry_size} . 'px');
         $layout->set_font_description($desc);
         my ($wid, $h) = $layout->get_pixel_size();
@@ -233,11 +242,9 @@ sub _adjust
 package Remind::PDF::Entry::color;
 use base 'Remind::PDF::Entry';
 
-# Strip the RGB prefix from body
+# Nothing to do for COLOR-type reminder
 sub _adjust
 {
-        my ($self) = @_;
-        $self->{body} =~ s/^\d+\s+\d+\s+\d+\s+//;
 }
 
 package Remind::PDF::Entry::postscript;

scripts/tkremind

@@ -1,5 +1,6 @@
 #!/bin/sh
 # -*-Mode: TCL;-*-
+# SPDX-License-Identifier: GPL-2.0-only
 
 #--------------------------------------------------------------
 #   TKREMIND
@@ -7,7 +8,7 @@
 #   A cheesy graphical front/back end for Remind using Tcl/Tk
 #
 #   This file is part of REMIND.
-#   Copyright (C) 1992-2021 Dianne Skoll
+#   Copyright (C) 1992-2023 Dianne Skoll
 #
 #--------------------------------------------------------------
 
@@ -103,6 +104,9 @@ set OptDescr(RunCmd) "(String) If non-blank, run specified command when a pop-up
 set Option(FeedReminder) 0
 set OptDescr(FeedReminder) "(0/1) If 1, feed the reminder to RunCmd on standard input (see RunCmd option)"
 
+set Option(DayAnchor) "center"
+set OptDescr(DayAnchor) "(w/center/e) Anchor the day number to the left (w), center or right (e) of its container"
+
 set Option(Editor) "emacs +%d %s"
 set OptDescr(Editor) "(String) Specify command to edit a file.  %d is replaced with line number and %s with filename"
 
@@ -454,6 +458,7 @@ proc CreateCalFrame { w dayNames } {
     # Figure out reasonable height for text frames
     global SetFontsWorked
     global Option
+    global MondayFirst
     set h [winfo screenheight .]
     if {$h <= 480} {
 	if {$SetFontsWorked} {
@@ -467,7 +472,6 @@ proc CreateCalFrame { w dayNames } {
 	set h 5
     }
 
-    global MondayFirst
     frame $w -background $Option(LineColor)
     for {set i 0} {$i < 7} {incr i} {
 	if {$MondayFirst} {
@@ -483,7 +487,7 @@ proc CreateCalFrame { w dayNames } {
 	set n [expr $i*7]
 	for {set j 0} {$j < 7} {incr j} {
 	    set f [expr $n+$j]
-	    button $w.l$f -text "" -justify center -command "" \
+	    button $w.l$f -text "" -justify center -command "" -anchor $Option(DayAnchor) \
 		-state disabled -relief flat -bd 0 -padx 0 -pady 0 -font HeadingFont -highlightthickness 1
 	    text $w.t$f -width 12 -height $h -bd 0 -spacing3 3 -wrap word -relief flat \
 		-state disabled -takefocus 0 -cursor {} -font CalboxFont -foreground $Option(TextColor) -background $Option(BackgroundColor) \
@@ -544,7 +548,9 @@ proc ConfigureCalFrame { w firstDay numDays } {
 	$w.t$i configure -state disabled -takefocus 0
     }
     for {set i $first} {$i <= $last} {incr i} {
+	set row [expr ($i/7)+1]
 	grid $w.f$i
+        grid rowconfigure $w $row -weight 1
         pack $w.l$i -in $w.f$i -side top -expand 0 -fill x
         pack $w.t$i -in $w.f$i -side top -expand 1 -fill both
         raise $w.l$i
@@ -578,7 +584,7 @@ proc ConfigureCalFrame { w firstDay numDays } {
             pack $w.t$i -in $w.f$i -side top -expand 1 -fill both
             raise $w.l$i
             raise $w.t$i
-	    grid rowconfigure $w [expr $row+1] -weight 1
+	    grid rowconfigure $w $row -weight 1
 	}
 	$w.l$i configure -text "" -command "" -state normal -relief flat -foreground $Option(LabelColor) -background $Option(WinBackground) -highlightcolor $Option(LineColor) -highlightbackground $Option(WinBackground)
         $w.l$i configure -state disabled
@@ -793,12 +799,26 @@ proc EditOptions {} {
 	    -text "Feed popped-up reminder to command's standard input" \
 	    -variable tmpOpt(FeedReminder) -anchor w -justify left
 
+    frame $w.ancFrame
+    label $w.ancLabel -text "Anchor day numbers to:"
+    radiobutton $w.ancLeft \
+	    -text "Left" \
+	    -variable tmpOpt(DayAnchor) -value "w" -anchor w -justify left
+    radiobutton $w.ancCenter \
+	    -text "Center" \
+	    -variable tmpOpt(DayAnchor) -value "center" -anchor w -justify left
+    radiobutton $w.ancRight \
+	    -text "Right" \
+	    -variable tmpOpt(DayAnchor) -value "e" -anchor w -justify left
+    pack $w.ancLabel $w.ancLeft $w.ancCenter $w.ancRight -in $w.ancFrame -side left
+
     pack $w.startIconified -in $w.f -side top -expand 0 -fill x
     pack $w.showTodays -in $w.f -side top -expand 0 -fill x
     pack $w.confirmQuit -in $w.f -side top -expand 0 -fill x
     pack $w.bringDown -in $w.f -side top -expand 0 -fill x
     pack $w.ring -in $w.f -side top -expand 0 -fill x
     pack $w.deic -in $w.f -side top -expand 0 -fill x
+    pack $w.ancFrame -in $w.f -side top -expand 0 -fill x
     pack $w.sep1 -in $w.f -side top -expand 0 -fill x -ipady 1
     pack $w.rf -in $w.f -side top -expand 0 -fill x
     pack $w.feed -in $w.f -side top -expand 0 -fill x
@@ -877,6 +897,13 @@ proc SaveOptions { w } {
     for {set i 0} {$i < 7} {incr i} {
         .cal.day$i configure  -foreground $Option(LabelColor) -background $Option(WinBackground)
     }
+    for {set i 0} {$i < 6} {incr i} {
+	set n [expr $i*7]
+	for {set j 0} {$j < 7} {incr j} {
+	    set f [expr $n+$j]
+            .cal.l$f configure -anchor $Option(DayAnchor);
+        }
+    }
     .b.status configure -foreground $Option(LabelColor) -background $Option(WinBackground)
     .b.nqueued configure -foreground $Option(LabelColor) -background $Option(WinBackground)
     .b configure -background $Option(WinBackground)
@@ -929,6 +956,7 @@ proc WriteOptionsToFile {} {
 #***********************************************************************
 proc LoadOptions {} {
     global Option ConfigFile
+    global MondayFirst
     set problem [catch {set f [open "$ConfigFile" "r"]}]
     if {$problem} {
 	return
@@ -948,6 +976,9 @@ proc LoadOptions {} {
         set Option($key) $val
     }
     close $f
+    if {[regexp -- {-m.*} $Option(ExtraRemindArgs)]} {
+	set MondayFirst 1
+    }
     font configure CalboxFont {*}$Option(CalboxFont)
     font configure HeadingFont {*}$Option(HeadingFont)
 }
@@ -986,7 +1017,7 @@ proc ConfigureCalWindow { month year firstDay numDays } {
 proc FillCalWindow {} {
     set FileName ""
     set LineNo 0
-    global DayNames CurYear CurMonth MonthNames CommandLine Option TagToObj RemindErrors
+    global DayNames CurYear CurMonth MonthNames CommandLine Option TagToObj RemindErrors MondayFirst
 
     array unset TagToObj
 
@@ -1025,7 +1056,12 @@ proc FillCalWindow {} {
 
     # Update the day names in the calendar window
     for {set i 0} {$i < 7} {incr i} {
-        .cal.day$i configure -text [lindex $DayNames $i]
+	if {$MondayFirst} {
+	    set index [expr ($i+1)%7]
+	} else {
+	    set index $i
+	}
+        .cal.day$i configure -text [lindex $DayNames $index]
     }
     set offset [CalEntryOffset $firstWkday]
 
@@ -1060,8 +1096,13 @@ proc FillCalWindow {} {
 	} else {
 	    set tag "*"
 	}
-	set stuff [dict get $obj body]
-
+        if {[dict exists $obj calendar_body]} {
+            set stuff [dict get $obj calendar_body]
+        } elseif  {[dict exists $obj plain_body]} {
+            set stuff [dict get $obj plain_body]
+        } else {
+            set stuff [dict get $obj body]
+        }
 	set day [string trimleft $day 0]
 	set n [expr $day+$offset]
 	set month [string trimleft $month 0]
@@ -1085,30 +1126,31 @@ proc FillCalWindow {} {
 	    }
 	    "COLOUR" -
 	    "COLOR" {
-		if {[regexp {^ *([0-9]+) +([0-9]+) +([0-9]+) +(.*)$} $stuff all r g b rest]} {
-		    if {$r > 255} {
-			set r 255
-		    } elseif {$r < 0} {
-			set r 0
-		    }
-		    if {$g > 255} {
-			set g 255
-		    } elseif {$g < 0} {
-			set g 0
-		    }
-		    if {$b > 255} {
-			set b 255
-		    } elseif {$b < 0} {
-			set b 0
-		    }
-		    set color [format "%02X%02X%02X" $r $g $b]
-		    set extratags "clr$color"
-		    .cal.t$n configure -state normal
-		    .cal.t$n tag configure $extratags -foreground "#$color"
-		    .cal.t$n configure -state disabled -takefocus 0
-		    set stuff $rest
-		    set type "COLOR"
-		}
+                set r [dict get $obj r]
+                set g [dict get $obj g]
+                set b [dict get $obj b]
+                if {$r > 255} {
+                    set r 255
+                } elseif {$r < 0} {
+                    set r 0
+                }
+                if {$g > 255} {
+                    set g 255
+                } elseif {$g < 0} {
+                    set g 0
+                }
+                if {$b > 255} {
+                    set b 255
+                } elseif {$b < 0} {
+                    set b 0
+                }
+                set color [format "%02X%02X%02X" $r $g $b]
+                set extratags "clr$color"
+                .cal.t$n configure -state normal
+                .cal.t$n tag configure $extratags -foreground "#$color"
+                .cal.t$n configure -state disabled -takefocus 0
+                set stuff $stuff
+                set type "COLOR"
 	    }
 	}
 	if { $type != "*" && $type != "COLOR" && $type != "COLOUR"} {
@@ -2075,7 +2117,7 @@ proc CreateReminder {w} {
 
     # Check it out!
     global Remind
-    set f [open "|$Remind -arq -e - 2>&1" r+]
+    set f [open "|$Remind -arq -e - 2>@1" r+]
     puts $f "BANNER %"
     puts $f "$rem MSG %"
     puts $f "MSG %_%_%_%_"
@@ -3782,13 +3824,19 @@ proc ShowTodaysReminders {} {
         append cmdline "-b1 "
     }
     append cmdline $Option(ExtraRemindArgs);
-    append cmdline " $ReminderFile 2>/dev/null"
+    append cmdline " $ReminderFile 2>@1"
     set f [open $cmdline r]
     while {[gets $f line] >= 0} {
 	append stuff "$line\n"
     }
-    close $f
-    $w.text insert end $stuff
+    if {[catch { close $f } err]} {
+	$w.text insert end "Error running Remind\n\n"
+	$w.text insert end $stuff
+	$w.text insert end "\n"
+	$w.text insert end $err
+    } else {
+	$w.text insert end $stuff
+    }
     $w.text configure -state disabled
 }
 
@@ -3876,7 +3924,7 @@ proc InotifyReadable { fp } {
     catch { set num [gets $fp line] }
     if {$num < 0} {
         catch { exec kill [pid $fp] }
-        close $fp
+        catch { close $fp }
         return
     }
     ScheduleUpdateForChanges

src/Makefile.in

@@ -36,21 +36,21 @@ REMINDOBJS= $(REMINDSRCS:.c=.o)
 
 all: remind rem2ps
 
-test: remind
+test: all
 	@sh ../tests/test-rem
 
 .c.o:
-	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -I. -I$(srcdir) $<
+	@CC@ -c @CPPFLAGS@ @CFLAGS@ @DEFS@ $(CEXTRA) $(LANGDEF) -DSYSDIR=$(datarootdir)/remind -I. -I$(srcdir) $<
 
 $(REMINDOBJS): $(REMINDHDRS)
 
 rem2ps: rem2ps.o dynbuf.o json.o
-	@CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm
+	@CC@ @CFLAGS@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm
 
 remind: $(REMINDOBJS)
-	@CC@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@
+	@CC@ @CFLAGS@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@
 
-install-nostripped: all
+install: all
 	-mkdir -p $(DESTDIR)$(bindir) || true
 	for prog in $(PROGS) $(SCRIPTS) ; do \
 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
@@ -61,14 +61,19 @@ install-nostripped: all
 	for man in $(MANS) ; do  \
 		$(INSTALL_DATA) $$man $(DESTDIR)$(mandir)/man1 || exit 1; \
 	done
+	-mkdir -p $(DESTDIR)$(datarootdir)/remind || true
+	cp -R ../include/* $(DESTDIR)$(datarootdir)/remind
 
-install: install-nostripped
+install-stripped: install
 	strip $(DESTDIR)$(bindir)/remind || true
 	strip $(DESTDIR)$(bindir)/rem2ps || true
 
 clean:
 	rm -f *.o *~ core *.bak $(PROGS)
 
+cppcheck:
+	cppcheck --force --enable=all --suppress=variableScope --suppress=ConfigurationNotChecked *.c
+
 clobber:
 	rm -f *.o *~ remind rem2ps test.out core *.bak
 

src/compare-language-mods.pl

@@ -0,0 +1,54 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+my $language_map = {
+        en => 'ENGLISH',
+        de => 'GERMAN',
+        nl => 'DUTCH',
+        fi => 'FINNISH',
+        fr => 'FRENCH',
+        'no' => 'NORWEGIAN',
+        da => 'DANISH',
+        pl => 'POLISH',
+        is => 'ICELANDIC',
+        pt => 'BRAZPORT',
+        it => 'ITALIAN',
+        ro => 'ROMANIAN',
+        es => 'SPANISH',
+};
+
+if (!$ARGV[0]) {
+        print STDERR "Usage: $0 lang_code\n";
+        exit(1);
+}
+
+my $lang = $ARGV[0];
+if (!exists($language_map->{$lang})) {
+        print STDERR "$lang is not a valid language.\n";
+        exit(1);
+}
+
+my $flag = $language_map->{$lang};
+print STDERR "Testing for: $lang - $flag.\n";
+my_sys("make clean > /dev/null 2>&1") && die("make clean failed");
+my_sys("make -j6 all LANGDEF=-DLANG=$flag > /dev/null 2>&1") && die("make all failed");
+my_sys("./remind -q -r ../tests/tstlang.rem 2022-03-23 11:44 > test-$lang-compiled.out 2>&1");
+
+my_sys("make clean > /dev/null 2>&1") && die("make clean failed");
+my_sys("make -j6 all > /dev/null 2>&1") && die("make all failed");
+my_sys("./remind -q -r -ii=\\\"../include/lang/$lang.rem\\\" ../tests/tstlang.rem 2022-03-23 11:44 > test-$lang-runtime.out 2>&1");
+
+my $rc = my_sys("cmp test-$lang-compiled.out test-$lang-runtime.out > /dev/null 2>&1");
+if ($rc == 0) {
+        print STDERR "Congrats!  Compiled and runtime language output matches for $lang.\n";
+} else {
+        print STDERR "Whoops.  Compiled and runtime language output differs for $lang.\n"
+}
+exit(0);
+
+sub my_sys
+{
+        #print STDERR "Running: " . join(' ', @_) . "\n";
+        return system(@_);
+}

src/custom.h

@@ -6,7 +6,8 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -21,8 +22,8 @@
 /* The default values are initially set to the city hall in Ottawa,    */
 /* Ontario, Canada.    */
 /*---------------------------------------------------------------------*/
-#define DEFAULT_LATITUDE 45.42055555555555
-#define DEFAULT_LONGITUDE -75.68972222222223
+#define DEFAULT_LATITUDE 45.420556
+#define DEFAULT_LONGITUDE -75.689722
 #define LOCATION "Ottawa"
 
 /*---------------------------------------------------------------------*/

src/custom.h.in

@@ -6,7 +6,8 @@
 /*  which you can customize.                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -21,8 +22,8 @@
 /* The default values are initially set to the city hall in Ottawa,    */
 /* Ontario, Canada.    */
 /*---------------------------------------------------------------------*/
-#define DEFAULT_LATITUDE 45.42055555555555
-#define DEFAULT_LONGITUDE -75.68972222222223
+#define DEFAULT_LATITUDE 45.420556
+#define DEFAULT_LONGITUDE -75.689722
 #define LOCATION "Ottawa"
 
 /*---------------------------------------------------------------------*/

src/dorem.c

@@ -7,7 +7,8 @@
 /*  commands.                                                  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -29,7 +30,7 @@ static int ParseLocalOmit (ParsePtr s, Trigger *t);
 static int ParseScanFrom (ParsePtr s, Trigger *t, int type);
 static int ParsePriority (ParsePtr s, Trigger *t);
 static int ParseUntil (ParsePtr s, Trigger *t, int type);
-static int ShouldTriggerBasedOnWarn (Trigger *t, int jul, int *err);
+static int ShouldTriggerBasedOnWarn (Trigger *t, int dse, int *err);
 static int ComputeTrigDuration(TimeTrig *t);
 
 static int
@@ -55,7 +56,7 @@ int DoRem(ParsePtr p)
     Trigger trig;
     TimeTrig tim;
     int r, err;
-    int jul;
+    int dse;
     DynamicBuffer buf;
     Token tok;
 
@@ -96,9 +97,13 @@ int DoRem(ParsePtr p)
 	FindToken(DBufValue(&buf), &tok);
 	DBufFree(&buf);
 	if (tok.type == T_Empty || tok.type == T_Comment) {
+            r = OK;
+            if (trig.addomit) {
+                r = AddGlobalOmit(LastTriggerDate);
+            }
 	    DBufFree(&buf);
 	    FreeTrig(&trig);
-	    return OK;
+	    return r;
 	}
 	if (tok.type != T_RemType || tok.val == SAT_TYPE) {
 	    DBufFree(&buf);
@@ -120,14 +125,14 @@ int DoRem(ParsePtr p)
 	    DBufFree(&buf);
 	}
 	trig.typ = tok.val;
-	jul = LastTriggerDate;
+	dse = LastTriggerDate;
 	if (!LastTrigValid || PurgeMode) {
 	    FreeTrig(&trig);
 	    return OK;
 	}
     } else {
 	/* Calculate the trigger date */
-	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+	dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
 	if (r) {
 	    if (PurgeMode) {
 		PurgeEchoLine("%s: %s\n", "#!P! Problem calculating trigger date", ErrMsg[r]);
@@ -143,14 +148,14 @@ int DoRem(ParsePtr p)
 
     /* Add to global OMITs if so indicated */
     if (trig.addomit) {
-        r = AddGlobalOmit(jul);
+        r = AddGlobalOmit(dse);
         if (r) {
 	    FreeTrig(&trig);
             return r;
         }
     }
     if (PurgeMode) {
-	if (trig.expired || jul < JulianToday) {
+	if (trig.expired || dse < DSEToday) {
 	    if (p->expr_happened) {
 		if (p->nonconst_expr) {
 		    PurgeEchoLine("%s\n", "#!P: Next line may have expired, but contains non-constant expression");
@@ -170,10 +175,10 @@ int DoRem(ParsePtr p)
     }
 
     /* Queue the reminder, if necessary */
-    if (jul == JulianToday &&
+    if (dse == DSEToday &&
 	!(!IgnoreOnce &&
 	  trig.once != NO_ONCE &&
-	  FileAccessDate == JulianToday))
+	  FileAccessDate == DSEToday))
 	QueueReminder(p, &trig, &tim, trig.sched);
     /* If we're in daemon mode, do nothing over here */
     if (Daemon) {
@@ -182,8 +187,8 @@ int DoRem(ParsePtr p)
     }
 
     r = OK;
-    if (ShouldTriggerReminder(&trig, &tim, jul, &err)) {
-	if ( (r=TriggerReminder(p, &trig, &tim, jul)) ) {
+    if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
+	if ( (r=TriggerReminder(p, &trig, &tim, dse)) ) {
 	    FreeTrig(&trig);
 	    return r;
 	}
@@ -230,6 +235,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
     trig->skip = NO_SKIP;
     trig->once = NO_ONCE;
     trig->addomit = 0;
+    trig->noqueue = 0;
     trig->typ = NO_TYPE;
     trig->scanfrom = NO_DATE;
     trig->from = NO_DATE;
@@ -287,7 +293,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    if (trig->d != NO_DAY) return E_DAY_TWICE;
 	    if (trig->m != NO_MON) return E_MON_TWICE;
 	    if (trig->y != NO_YR)  return E_YR_TWICE;
-	    FromJulian(tok.val, &y, &m, &d);
+	    FromDSE(tok.val, &y, &m, &d);
 	    trig->y = y;
 	    trig->m = m;
 	    trig->d = d;
@@ -298,7 +304,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    if (trig->d != NO_DAY) return E_DAY_TWICE;
 	    if (trig->m != NO_MON) return E_MON_TWICE;
 	    if (trig->y != NO_YR)  return E_YR_TWICE;
-	    FromJulian(tok.val / MINUTES_PER_DAY, &y, &m, &d);
+	    FromDSE(tok.val / MINUTES_PER_DAY, &y, &m, &d);
 	    trig->y = y;
 	    trig->m = m;
 	    trig->d = d;
@@ -431,6 +437,11 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
             trig->addomit = 1;
             break;
 
+        case T_NoQueue:
+            DBufFree(&buf);
+            trig->noqueue = 1;
+            break;
+
 	case T_Omit:
 	    DBufFree(&buf);
 	    if (trig->omitfunc[0]) {
@@ -470,7 +481,12 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	case T_Tag:
 	    r = ParseToken(s, &buf);
 	    if (r) return r;
+            if (strchr(DBufValue(&buf), ',')) {
+                DBufFree(&buf);
+                return E_PARSE_ERR;
+            }
 	    AppendTag(&(trig->tags), DBufValue(&buf));
+	    DBufFree(&buf);
 	    break;
 
 	case T_Duration:
@@ -543,7 +559,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
     /* Check for some warning conditions */
     if (!s->nonconst_expr) {
         if (trig->y != NO_YR && trig->m != NO_MON && trig->d != NO_DAY && trig->until != NO_UNTIL) {
-            if (Julian(trig->y, trig->m, trig->d) > trig->until) {
+            if (DSE(trig->y, trig->m, trig->d) > trig->until) {
                 Wprint("Warning: UNTIL/THROUGH date earlier than start date");
             }
         }
@@ -564,7 +580,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 
     /* Set scanfrom to default if not set explicitly */
     if (trig->scanfrom == NO_DATE) {
-        trig->scanfrom = JulianToday;
+        trig->scanfrom = DSEToday;
     }
 
     return OK;
@@ -723,7 +739,7 @@ static int ParseUntil(ParsePtr s, Trigger *t, int type)
 		Eprint("%s: %s", which, ErrMsg[E_DAY_TWICE]);
 		return E_DAY_TWICE;
 	    }
-	    FromJulian(tok.val, &y, &m, &d);
+	    FromDSE(tok.val, &y, &m, &d);
 	    break;
 
 	default:
@@ -736,7 +752,7 @@ static int ParseUntil(ParsePtr s, Trigger *t, int type)
 		DBufFree(&buf);
 		return E_BAD_DATE;
 	    }
-	    t->until = Julian(y, m, d);
+	    t->until = DSE(y, m, d);
 	    PushToken(DBufValue(&buf), s);
 	    DBufFree(&buf);
 	    return OK;
@@ -815,7 +831,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 		Eprint("%s: %s", word, ErrMsg[E_DAY_TWICE]);
 		return E_DAY_TWICE;
 	    }
-	    FromJulian(tok.val, &y, &m, &d);
+	    FromDSE(tok.val, &y, &m, &d);
 	    break;
 
 	case T_Back:
@@ -839,7 +855,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 	    if (tok.val < 0) {
 		tok.val = -tok.val;
 	    }
-	    FromJulian(JulianToday - tok.val, &y, &m, &d);
+	    FromDSE(DSEToday - tok.val, &y, &m, &d);
 	    break;
 
 	default:
@@ -852,11 +868,11 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 		DBufFree(&buf);
 		return E_BAD_DATE;
 	    }
-	    t->scanfrom = Julian(y, m, d);
+	    t->scanfrom = DSE(y, m, d);
 	    if (type == FROM_TYPE) {
 		t->from = t->scanfrom;
-		if (t->scanfrom < JulianToday) {
-		    t->scanfrom = JulianToday;
+		if (t->scanfrom < DSEToday) {
+		    t->scanfrom = DSEToday;
 		}
 	    } else {
 		t->from = NO_DATE;
@@ -868,6 +884,8 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 	}
     }
 }
+
+
 /***************************************************************/
 /*                                                             */
 /*  TriggerReminder                                            */
@@ -875,7 +893,7 @@ static int ParseScanFrom(ParsePtr s, Trigger *t, int type)
 /*  Trigger the reminder if it's a RUN or MSG type.            */
 /*                                                             */
 /***************************************************************/
-int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
+int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse)
 {
     int r, y, m, d;
     char PrioExpr[VAR_NAME_LEN+25];
@@ -929,25 +947,26 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     }
 /* If it's a MSG-type reminder, and no -k option was used, issue the banner. */
     if ((t->typ == MSG_TYPE || t->typ == MSF_TYPE) 
-	&& !NumTriggered && !NextMode && !MsgCommand) {
+	&& !DidMsgReminder && !NextMode && !MsgCommand) {
+        DidMsgReminder = 1;
 	if (!DoSubstFromString(DBufValue(&Banner), &buf,
-			       JulianToday, NO_TIME) &&
+			       DSEToday, NO_TIME) &&
 	    DBufLen(&buf)) {
-	printf("%s\n", DBufValue(&buf));
-	}
+            printf("%s\n", DBufValue(&buf));
+        }
 	DBufFree(&buf);
     }
 
 /* If it's NextMode, process as a ADVANCE_MODE-type entry, and issue
    simple-calendar format. */
     if (NextMode) {
-	if ( (r=DoSubst(p, &buf, t, tim, jul, ADVANCE_MODE)) ) return r;
+	if ( (r=DoSubst(p, &buf, t, tim, dse, ADVANCE_MODE)) ) return r;
 	if (!DBufLen(&buf)) {
 	    DBufFree(&buf);
 	    DBufFree(&pre_buf);
 	    return OK;
 	}
-	FromJulian(jul, &y, &m, &d);
+	FromDSE(dse, &y, &m, &d);
  	sprintf(tmpBuf, "%04d/%02d/%02d ", y, m+1, d);
  	if (DBufPuts(&calRow, tmpBuf) != OK) {
  	    DBufFree(&calRow);
@@ -1030,7 +1049,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
 		    if (is_color) {
-			DBufPuts(&buf, Colorize(red, green, blue));
+			DBufPuts(&buf, Colorize(red, green, blue, 0, 1));
 		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
@@ -1044,9 +1063,9 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     }
 
     if (is_color) {
-	DBufPuts(&buf, Colorize(red, green, blue));
+	DBufPuts(&buf, Colorize(red, green, blue, 0, 1));
     }
-    if ( (r=DoSubst(p, &buf, t, tim, jul, NORMAL_MODE)) ) return r;
+    if ( (r=DoSubst(p, &buf, t, tim, dse, NORMAL_MODE)) ) return r;
     if (t->typ != RUN_TYPE) {
 	if (UserFuncExists("msgsuffix") == 1) {
 	    sprintf(PrioExpr, "msgsuffix(%d)", t->priority);
@@ -1055,7 +1074,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 	    if (!r) {
 		if (!DoCoerce(STR_TYPE, &v)) {
 		    if (is_color) {
-			DBufPuts(&buf, Colorize(red, green, blue));
+			DBufPuts(&buf, Colorize(red, green, blue, 0, 1));
 		    }
 		    if (DBufPuts(&buf, v.v.str) != OK) {
 			DBufFree(&buf);
@@ -1069,7 +1088,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
     }
 
     if (is_color) {
-	DBufPuts(&buf, Decolorize(red, green, blue));
+	DBufPuts(&buf, Decolorize());
     }
 
     if ((!MsgCommand && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) {
@@ -1081,7 +1100,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 
 /* If we are sorting, just queue it up in the sort buffer */
     if (SortByDate) {
-	if (InsertIntoSortBuffer(jul, tim->ttime, DBufValue(&buf),
+	if (InsertIntoSortBuffer(dse, tim->ttime, DBufValue(&buf),
 				 t->typ, t->priority) == OK) {
 	    DBufFree(&buf);
 	    NumTriggered++;
@@ -1128,20 +1147,20 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int jul)
 /*  triggered.  Sets *err non-zero in event of an error.       */
 /*                                                             */
 /***************************************************************/
-int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
+int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
 {
     int r, omit;
     *err = 0;
 
     /* Handle the ONCE modifier in the reminder. */
-    if (!IgnoreOnce && t->once !=NO_ONCE && FileAccessDate == JulianToday)
+    if (!IgnoreOnce && t->once !=NO_ONCE && FileAccessDate == DSEToday)
 	return 0;
 
-    if (jul < JulianToday) return 0;
+    if (dse < DSEToday) return 0;
 
     /* Don't trigger timed reminders if DontIssueAts is true, and if the
        reminder is for today */
-    if (jul == JulianToday && DontIssueAts && tim->ttime != NO_TIME) {
+    if (dse == DSEToday && DontIssueAts && tim->ttime != NO_TIME) {
 	if (DontIssueAts > 1) {
 	    /* If two or more -a options, then *DO* issue ats that are in the
 	       future */
@@ -1155,7 +1174,7 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
 
     /* Don't trigger "old" timed reminders */
 /*** REMOVED...
-  if (jul == JulianToday &&
+  if (dse == DSEToday &&
   tim->ttime != NO_TIME &&
   tim->ttime < SystemTime(0) / 60) return 0;
   *** ...UNTIL HERE */
@@ -1166,28 +1185,28 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
     /* If there's a "warn" function, it overrides any deltas */
     if (t->warn[0] != 0) {
 	if (DeltaOffset) {
-	    if (jul <= JulianToday + DeltaOffset) {
+	    if (dse <= DSEToday + DeltaOffset) {
 		return 1;
 	    }
 	}
-	return ShouldTriggerBasedOnWarn(t, jul, err);
+	return ShouldTriggerBasedOnWarn(t, dse, err);
     }
 
     /* Move back by delta days, if any */
     if (t->delta != NO_DELTA) {
 	if (t->delta < 0)
-	    jul = jul + t->delta;
+	    dse = dse + t->delta;
 	else {
 	    int iter = 0;
 	    int max = MaxSatIter;
 	    r = t->delta;
 	    if (max < r*2) max = r*2;
 	    while(iter++ < max) {
-		if (!r || (jul <= JulianToday)) {
+		if (!r || (dse <= DSEToday)) {
 		    break;
 		}
-		jul--;
-		*err = IsOmitted(jul, t->localomit, t->omitfunc, &omit);
+		dse--;
+		*err = IsOmitted(dse, t->localomit, t->omitfunc, &omit);
 		if (*err) return 0;
 		if (!omit) r--;
 	    }
@@ -1200,7 +1219,7 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
     }
 
     /* Should we trigger the reminder? */
-    return (jul <= JulianToday + DeltaOffset);
+    return (dse <= DSEToday + DeltaOffset);
 }
 
 /***************************************************************/
@@ -1212,7 +1231,7 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul, int *err)
 /***************************************************************/
 int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
 {
-    int iter, jul, r, start;
+    int iter, dse, r, start;
     Value v;
     char const *s;
     char const *t;
@@ -1221,25 +1240,25 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
     iter = 0;
     start = trig->scanfrom;
     while (iter++ < MaxSatIter) {
-	jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
+	dse = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, 0);
 	if (r) {
 	    if (r == E_CANT_TRIG) return OK; else return r;
 	}
-	if (jul != start && trig->duration_days) {
-	    jul = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, trig->duration_days);
+	if (dse != start && trig->duration_days) {
+	    dse = ComputeTriggerNoAdjustDuration(start, trig, tt, &r, 1, trig->duration_days);
 	    if (r) {
 		if (r == E_CANT_TRIG) return OK; else return r;
 	    }
-	} else if (jul == start) {
+	} else if (dse == start) {
 	    if (tt->ttime != NO_TIME) {
 		trig->eventstart = MINUTES_PER_DAY * r + tt->ttime;
 		if (tt->duration != NO_TIME) {
 		    trig->eventduration = tt->duration;
 		}
 	    }
-	    SaveAllTriggerInfo(trig, tt, jul, tt->ttime, 1);
+	    SaveAllTriggerInfo(trig, tt, dse, tt->ttime, 1);
 	}
-	if (jul == -1) {
+	if (dse == -1) {
 	    return E_EXPIRED;
 	}
 	s = p->pos;
@@ -1249,10 +1268,10 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
 	if (v.type != INT_TYPE && v.type != STR_TYPE) return E_BAD_TYPE;
 	if ((v.type == INT_TYPE && v.v.val) ||
 	    (v.type == STR_TYPE && *v.v.str)) {
-	    AdjustTriggerForDuration(trig->scanfrom, jul, trig, tt, 1);
+	    AdjustTriggerForDuration(trig->scanfrom, dse, trig, tt, 1);
 	    if (DebugFlag & DB_PRTTRIG) {
 		int y, m, d;
-		FromJulian(LastTriggerDate, &y, &m, &d);
+		FromDSE(LastTriggerDate, &y, &m, &d);
 		fprintf(ErrFp, "%s(%d): Trig(satisfied) = %s, %d %s, %d",
 			FileName, LineNo,
 			get_day_name(LastTriggerDate % 7),
@@ -1274,10 +1293,10 @@ int DoSatRemind(Trigger *trig, TimeTrig *tt, ParsePtr p)
 	    return OK;
 	}
 	p->pos = s;
-	if (jul+trig->duration_days < start) {
+	if (dse+trig->duration_days < start) {
 	    start++;
 	} else {
-	    start = jul+trig->duration_days+1;
+	    start = dse+trig->duration_days+1;
 	}
     }
     p->pos = t;
@@ -1384,7 +1403,7 @@ finished:
 /*  function.                                                  */
 /*                                                             */
 /***************************************************************/
-static int ShouldTriggerBasedOnWarn(Trigger *t, int jul, int *err)
+static int ShouldTriggerBasedOnWarn(Trigger *t, int dse, int *err)
 {
     char buffer[VAR_NAME_LEN+32];
     int i;
@@ -1396,7 +1415,7 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int jul, int *err)
     /* If no proper function exists, barf... */
     if (UserFuncExists(t->warn) != 1) {
 	Eprint("%s: `%s'", ErrMsg[M_BAD_WARN_FUNC], t->warn);
-	return (jul == JulianToday);
+	return (dse == DSEToday);
     }
     for (i=1; ; i++) {
 	sprintf(buffer, "%s(%d)", t->warn, i);
@@ -1405,28 +1424,28 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int jul, int *err)
 	if (r) {
 	    Eprint("%s: `%s': %s", ErrMsg[M_BAD_WARN_FUNC],
 		   t->warn, ErrMsg[r]);
-	    return (jul == JulianToday);
+	    return (dse == DSEToday);
 	}
 	if (v.type != INT_TYPE) {
 	    DestroyValue(v);
 	    Eprint("%s: `%s': %s", ErrMsg[M_BAD_WARN_FUNC],
 		   t->warn, ErrMsg[E_BAD_TYPE]);
-	    return (jul == JulianToday);
+	    return (dse == DSEToday);
 	}
 
 	/* If absolute value of return is not monotonically
            decreasing, exit */
 	if (i > 1 && abs(v.v.val) >= lastReturnVal) {
-	    return (jul == JulianToday);
+	    return (dse == DSEToday);
 	}
 
 	lastReturnVal = abs(v.v.val);
 	/* Positive values: Just subtract.  Negative values:
            skip omitted days. */
 	if (v.v.val >= 0) {
-	    if (JulianToday + v.v.val == jul) return 1;
+	    if (DSEToday + v.v.val == dse) return 1;
 	} else {
-	    int j = jul;
+	    int j = dse;
 	    int iter = 0;
 	    int max = MaxSatIter;
 	    if (max < v.v.val * 2) max = v.v.val*2;
@@ -1443,7 +1462,7 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int jul, int *err)
 	        Eprint("Delta: Bad OMITFUNC? %s", ErrMsg[E_CANT_TRIG]);
 	        return 0;
 	    }
-	    if (j == JulianToday) return 1;
+	    if (j == DSEToday) return 1;
 	}
     }
 }

src/dynbuf.c

@@ -6,7 +6,8 @@
 /*  buffers.                                                   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 

src/dynbuf.h

@@ -5,7 +5,8 @@
 /*  Declaration of functions for manipulating dynamic buffers  */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -31,6 +32,8 @@ int DBufGets(DynamicBuffer *dbuf, FILE *fp);
 #define DBufValue(bufPtr) ((bufPtr)->buffer)
 #define DBufLen(bufPtr) ((bufPtr)->len)
 
-#define DBufPutc(dbuf, c) ( (dbuf)->allocatedLen < (dbuf)->len+1 ) ? (dbuf)->buffer[(dbuf)->len++] = c, (dbuf)->buffer[(dbuf)->len] = 0, OK : DBufPutcFN((dbuf), c)
+#define DBufPutc(dbuf, c) ( ( (dbuf)->allocatedLen <= (dbuf)->len+1 ) ?   \
+    DBufPutcFN( (dbuf), c) : \
+    ( (dbuf)->buffer[(dbuf)->len++] = c, (dbuf)->buffer[(dbuf)->len] = 0, OK) )
 
 #endif /* DYNBUF_H */

src/err.h

@@ -5,7 +5,8 @@
 /*  Error definitions.                                         */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -70,7 +71,7 @@
 #define E_MON_TWICE	     51
 #define E_DAY_TWICE	     52
 #define E_UNKNOWN_TOKEN	     53
-#define E_SPEC_MON_DAY	     54
+#define E_SPEC_MON    	     54
 #define E_2MANY_PART	     55
 #define E_2MANY_FULL	     56
 #define E_PUSH_NOPOP	     57
@@ -187,7 +188,7 @@ EXTERN char *ErrMsg[]
     "Month specified twice",
     "Day specified twice",
     "Unknown token",
-    "Must specify month and day in OMIT command",
+    "Must specify month in OMIT command",
     "Too many partial OMITs",
     "Too many full OMITs",
     "Warning: PUSH-OMIT-CONTEXT without matching POP-OMIT-CONTEXT",

src/expr.c

@@ -5,7 +5,8 @@
 /*  This file contains routines to parse and evaluate          */
 /*  expressions.                                               */
 /*                                                             */
-/*  Copyright 1992-2021 by Dianne Skoll                        */
+/*  Copyright 1992-2023 by Dianne Skoll                        */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -84,10 +85,12 @@ Operator UnOp[] = {
 
 extern BuiltinFunc Func[];
 
-Operator OpStack[OP_STACK_SIZE];
-Value    ValStack[VAL_STACK_SIZE];
-int      OpStackPtr = 0;
-int      ValStackPtr = 0;
+static Operator OpStack[OP_STACK_SIZE];
+static int      OpStackPtr = 0;
+
+/* ValStack can't be static - needed by funcs.c */
+       Value    ValStack[VAL_STACK_SIZE];
+       int      ValStackPtr = 0;
 
 /***************************************************************/
 /*                                                             */
@@ -251,6 +254,10 @@ static int ParseExprToken(DynamicBuffer *buf, char const **in)
 		    DBufFree(buf);
 		    return E_NO_MEM;
 		}
+                if (!**in) {
+                    DBufFree(buf);
+                    return E_MISS_QUOTE;
+                }
 		continue;
 	    }
 	    c = *(*in)++;
@@ -369,12 +376,10 @@ int Evaluate(char const **s, Var *locals, ParsePtr p)
 	    DBufFree(&ExprBuf);
 	    r = Evaluate(s, locals, p);  /* Leaves the last parsed token in ExprBuf */
 	    if (r) return r;
-	    r = OK;
-	    if (*DBufValue(&ExprBuf) != ')') {
+            if (*DBufValue(&ExprBuf) != ')') {
 		DBufFree(&ExprBuf);
 		return E_MISS_RIGHT_PAREN;
 	    }
-	    if (r) return r;
 	} else if (*DBufValue(&ExprBuf) == '+') {
 	    continue; /* Ignore unary + */
 	}
@@ -656,13 +661,13 @@ int DoCoerce(char type, Value *v)
 	case TIME_TYPE: sprintf(coerce_buf, "%02d%c%02d", v->v.val / 60,
 			       TimeSep, v->v.val % 60);
 	break;
-	case DATE_TYPE: FromJulian(v->v.val, &y, &m, &d);
+	case DATE_TYPE: FromDSE(v->v.val, &y, &m, &d);
 	    sprintf(coerce_buf, "%04d%c%02d%c%02d",
 		    y, DateSep, m+1, DateSep, d);
 	    break;
 	case DATETIME_TYPE:
 	    i = v->v.val / MINUTES_PER_DAY;
-	    FromJulian(i, &y, &m, &d);
+	    FromDSE(i, &y, &m, &d);
 	    k = v->v.val % MINUTES_PER_DAY;
 	    h = k / 60;
 	    i = k % 60;
@@ -783,12 +788,11 @@ static int Add(void)
 
 /* If both are ints, just add 'em */
     if (v2.type == INT_TYPE && v1.type == INT_TYPE) {
-        int old = v1.v.val;
-	v1.v.val += v2.v.val;
         /* Check for overflow */
-        if (_private_add_overflow(v1.v.val, v2.v.val, old)) {
+        if (_private_add_overflow(v1.v.val, v2.v.val)) {
             return E_2HIGH;
         }
+	v1.v.val += v2.v.val;
 	PushValStack(v1);
 	return OK;
     }
@@ -796,9 +800,8 @@ static int Add(void)
 /* If it's a date plus an int, add 'em */
     if ((v1.type == DATE_TYPE && v2.type == INT_TYPE) ||
 	(v1.type == INT_TYPE && v2.type == DATE_TYPE)) {
-        int old = v1.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val += v2.v.val;
-        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	v1.type = DATE_TYPE;
 	PushValStack(v1);
@@ -808,9 +811,8 @@ static int Add(void)
 /* If it's a datetime plus an int or a time, add 'em */
     if ((v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) ||
 	((v1.type == INT_TYPE || v1.type == TIME_TYPE) && v2.type == DATETIME_TYPE)) {
-        int old = v1.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val += v2.v.val;
-        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	v1.type = DATETIME_TYPE;
 	PushValStack(v1);
@@ -822,9 +824,8 @@ static int Add(void)
     if ((v1.type == TIME_TYPE && v2.type == INT_TYPE) ||
 	(v1.type == INT_TYPE && v2.type == TIME_TYPE) ||
 	(v1.type == TIME_TYPE && v2.type == TIME_TYPE)) {
-        int old = v1.v.val;
+        if (_private_add_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val += v2.v.val;
-        if (_private_add_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	v1.v.val = v1.v.val % MINUTES_PER_DAY;
 	if (v1.v.val < 0) v1.v.val += MINUTES_PER_DAY;
 	v1.type = TIME_TYPE;
@@ -885,18 +886,16 @@ static int Subtract(void)
 
     /* If they're both INTs, do subtraction */
     if (v1.type == INT_TYPE && v2.type == INT_TYPE) {
-        int old = v1.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val)) return E_2HIGH;
 	v1.v.val -= v2.v.val;
-        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_2HIGH;
 	PushValStack(v1);
 	return OK;
     }
 
     /* If it's a date minus an int, do subtraction, checking for underflow */
     if (v1.type == DATE_TYPE && v2.type == INT_TYPE) {
-        int old = v1.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val -= v2.v.val;
-        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	PushValStack(v1);
 	return OK;
@@ -905,9 +904,8 @@ static int Subtract(void)
     /* If it's a datetime minus an int or a time, do subtraction,
      * checking for underflow */
     if (v1.type == DATETIME_TYPE && (v2.type == INT_TYPE || v2.type == TIME_TYPE)) {
-        int old = v1.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val -= v2.v.val;
-        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	if (v1.v.val < 0) return E_DATE_OVER;
 	PushValStack(v1);
 	return OK;
@@ -925,9 +923,8 @@ static int Subtract(void)
     if ((v1.type == TIME_TYPE && v2.type == TIME_TYPE) ||
 	(v1.type == DATETIME_TYPE && v2.type == DATETIME_TYPE) ||
 	(v1.type == DATE_TYPE && v2.type == DATE_TYPE)) {
-        int old = v1.v.val;
+        if (_private_sub_overflow(v1.v.val, v2.v.val)) return E_DATE_OVER;
 	v1.v.val -= v2.v.val;
-        if (_private_sub_overflow(v1.v.val, v2.v.val, old)) return E_DATE_OVER;
 	v1.type = INT_TYPE;
 	PushValStack(v1);
 	return OK;
@@ -962,11 +959,8 @@ static int Multiply(void)
             (v1.v.val == -1 && v2.v.val == INT_MIN)) {
             return E_2HIGH;
         }
-        int old = v1.v.val;
+        if (_private_mul_overflow(v1.v.val, v2.v.val)) return E_2HIGH;
 	v1.v.val *= v2.v.val;
-        if (v2.v.val != 0) {
-            if (_private_div(v1.v.val, v2.v.val) != old) return E_2HIGH;
-        }
 	PushValStack(v1);
 	return OK;
     }
@@ -1177,9 +1171,8 @@ static int UnMinus(void)
 {
     Value *v = &ValStack[ValStackPtr-1];
     if (v->type != INT_TYPE) return E_BAD_TYPE;
-    int old = v->v.val;
+    if (v->v.val == INT_MIN) return E_2HIGH;
     v->v.val = -v->v.val;
-    if (_private_unminus_overflow(old, v->v.val)) return E_2HIGH;
     return OK;
 }
 
@@ -1200,9 +1193,9 @@ static int LogNot(void)
 
 /***************************************************************/
 /*                                                             */
-/*  FindFunc                                                   */
+/*  FindOperator                                               */
 /*                                                             */
-/*  Find a function.                                           */
+/*  Find an operator.                                          */
 /*                                                             */
 /***************************************************************/
 Operator *FindOperator(char const *name, Operator where[], int num)
@@ -1211,7 +1204,7 @@ Operator *FindOperator(char const *name, Operator where[], int num)
     int mid, r;
     while (top >= bot) {
 	mid = (top + bot) / 2;
-	r = StrCmpi(name, where[mid].name);
+	r = strcmp(name, where[mid].name);
 	if (!r) return &where[mid];
 	else if (r > 0) bot = mid+1;
 	else top = mid-1;
@@ -1219,6 +1212,20 @@ Operator *FindOperator(char const *name, Operator where[], int num)
     return NULL;
 }
 
+/* Compare two strings case-insensitively, where we KNOW
+   that the second string is definitely lower-case */
+static int strcmp_lcfirst(char const *s1, char const *s2)
+{
+    int r;
+    while (*s1 && *s2) {
+	r = tolower(*s1) - *s2;
+	if (r) return r;
+	s1++;
+	s2++;
+    }
+    return tolower(*s1) - *s2;
+}
+
 /***************************************************************/
 /*                                                             */
 /*  FindFunc                                                   */
@@ -1232,7 +1239,7 @@ BuiltinFunc *FindFunc(char const *name, BuiltinFunc where[], int num)
     int mid, r;
     while (top >= bot) {
 	mid = (top + bot) / 2;
-	r = StrCmpi(name, where[mid].name);
+	r = strcmp_lcfirst(name, where[mid].name);
 	if (!r) return &where[mid];
 	else if (r > 0) bot = mid+1;
 	else top = mid-1;
@@ -1250,12 +1257,31 @@ BuiltinFunc *FindFunc(char const *name, BuiltinFunc where[], int num)
 void PrintValue (Value *v, FILE *fp)
 {
     int y, m, d;
-    char const *s;
+    unsigned char const *s;
 
     if (v->type == STR_TYPE) {
-	s=v->v.str;
+	s = (unsigned char const *) v->v.str;
 	putc('"', fp);
-	for (y=0; y<MAX_PRT_LEN && *s; y++) putc(*s++, fp);
+	for (y=0; y<MAX_PRT_LEN && *s; y++) {
+            switch(*s) {
+            case '\a': fprintf(ErrFp, "\\a"); break;
+            case '\b': fprintf(ErrFp, "\\b"); break;
+            case '\f': fprintf(ErrFp, "\\f"); break;
+            case '\n': fprintf(ErrFp, "\\n"); break;
+            case '\r': fprintf(ErrFp, "\\r"); break;
+            case '\t': fprintf(ErrFp, "\\t"); break;
+            case '\v': fprintf(ErrFp, "\\v"); break;
+            case '"':  fprintf(ErrFp, "\\\""); break;
+            case '\\':  fprintf(ErrFp, "\\\\"); break;
+            default:
+                if (*s < 32) {
+                    fprintf(ErrFp, "\\x%02x", (unsigned int) *s);
+                } else {
+                    putc(*s, ErrFp); break;
+                }
+            }
+            s++;
+        }
 	putc('"',fp);
 	if (*s) fprintf(fp, "...");
     }
@@ -1263,11 +1289,11 @@ void PrintValue (Value *v, FILE *fp)
     else if (v->type == TIME_TYPE) fprintf(fp, "%02d%c%02d", v->v.val / 60,
 					   TimeSep, v->v.val % 60);
     else if (v->type == DATE_TYPE) {
-	FromJulian(v->v.val, &y, &m, &d);
+	FromDSE(v->v.val, &y, &m, &d);
 	fprintf(fp, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
     }
     else if (v->type == DATETIME_TYPE) {
-	FromJulian(v->v.val / MINUTES_PER_DAY, &y, &m, &d);
+	FromDSE(v->v.val / MINUTES_PER_DAY, &y, &m, &d);
 	fprintf(fp, "%04d%c%02d%c%02d%c%02d%c%02d", y, DateSep, m+1, DateSep, d, DateTimeSep,
 		(v->v.val % MINUTES_PER_DAY) / 60, TimeSep, (v->v.val % MINUTES_PER_DAY) % 60);
     }
@@ -1340,11 +1366,11 @@ int ParseLiteralTime(char const **s, int *tim)
 /*                                                             */
 /*  ParseLiteralDate                                           */
 /*                                                             */
-/*  Parse a literal date or datetime.  Return result in jul    */
+/*  Parse a literal date or datetime.  Return result in dse    */
 /*  and tim; update s.                                         */
 /*                                                             */
 /***************************************************************/
-int ParseLiteralDate(char const **s, int *jul, int *tim)
+int ParseLiteralDate(char const **s, int *dse, int *tim)
 {
     int y, m, d;
     int r;
@@ -1374,7 +1400,7 @@ int ParseLiteralDate(char const **s, int *jul, int *tim)
     }
     if (!DateOK(y, m, d)) return E_BAD_DATE;
 
-    *jul = Julian(y, m, d);
+    *dse = DSE(y, m, d);
 
     /* Do we have a time part as well? */
     if (**s == ' ' || **s == '@' || **s == 'T' || **s == 't') {

src/expr.h

@@ -5,7 +5,8 @@
 /*  Contains a few definitions used by expression evaluator.   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -58,7 +59,7 @@ else \
    in various arithmetic operators.  They have to be in separate
    functions with extern linkage to defeat compiler optimizations
    that would otherwise break the overflow checks. */
-extern int _private_div(int a, int b);
-extern int _private_add_overflow(int result, int b, int old);
-extern int _private_sub_overflow(int result, int b, int old);
-extern int _private_unminus_overflow(int a, int b);
+extern int _private_mul_overflow(int a, int b);
+extern int _private_add_overflow(int a, int b);
+extern int _private_sub_overflow(int a, int b);
+

src/files.c

@@ -7,7 +7,8 @@
 /*  files.                                                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -96,6 +97,7 @@ static int ReadLineFromFile (int use_pclose);
 static int CacheFile (char const *fname, int use_pclose);
 static void DestroyCache (CachedFile *cf);
 static int CheckSafety (void);
+static int CheckSafetyAux (struct stat *statbuf);
 static int PopFile (void);
 static int IncludeCmd(char const *);
 static void OpenPurgeFile(char const *fname, char const *mode)
@@ -163,6 +165,7 @@ int ReadLine(void)
 	LineNo = CLine->LineNo;
 	CLine = CLine->next;
 	FreshLine = 1;
+        clear_callstack();
 	if (DebugFlag & DB_ECHO_LINE) OutputLine(ErrFp);
 	return OK;
     }
@@ -263,6 +266,7 @@ static int ReadLineFromFile(int use_pclose)
 	}
 
 	FreshLine = 1;
+        clear_callstack();
 	if (DebugFlag & DB_ECHO_LINE) OutputLine(ErrFp);
 	return OK;
     }
@@ -818,6 +822,7 @@ static int IncludeCmd(char const *cmd)
     int old_flag;
 
     FreshLine = 1;
+    clear_callstack();
     if (IStackPtr+1 >= INCLUDE_NEST) return E_NESTED_INCLUDE;
     i = &IStack[IStackPtr];
 
@@ -935,6 +940,7 @@ int IncludeFile(char const *fname)
     struct stat statbuf;
 
     FreshLine = 1;
+    clear_callstack();
     if (IStackPtr+1 >= INCLUDE_NEST) return E_NESTED_INCLUDE;
     i = &IStack[IStackPtr];
 
@@ -967,6 +973,11 @@ int IncludeFile(char const *fname)
     if (stat(fname, &statbuf) == 0) {
 	FilenameChain *fc;
 	if (S_ISDIR(statbuf.st_mode)) {
+            /* Check safety */
+            if (!CheckSafetyAux(&statbuf)) {
+                PopFile();
+                return E_NO_MATCHING_REMS;
+            }
 	    if (SetupGlobChain(fname, i) == OK) { /* Glob succeeded */
 		if (!i->chain) { /* Oops... no matching files */
 		    if (!Hush) {
@@ -1027,7 +1038,7 @@ int GetAccessDate(char const *file)
     if (t1->tm_year + 1900 < BASE)
 	return 0;
     else
-	return Julian(t1->tm_year+1900, t1->tm_mon, t1->tm_mday);
+	return DSE(t1->tm_year+1900, t1->tm_mon, t1->tm_mday);
 }
 
 /***************************************************************/
@@ -1080,8 +1091,8 @@ int TopLevel(void)
 /*  CheckSafety                                                */
 /*                                                             */
 /*  Returns 1 if current file is safe to read; 0 otherwise.    */
-/*  Currently only meaningful for UNIX.  If we are running as  */
-/*  root, we refuse to open files not owned by root.           */
+/*  If we are running as root, we refuse to open files not     */
+/*  owned by root.                                             */
 /*  We also reject world-writable files, no matter             */
 /*  who we're running as.                                      */
 /*  As a side effect, if we don't own the file, or it's not    */
@@ -1101,25 +1112,44 @@ static int CheckSafety(void)
 	return 0;
     }
 
+    if (!CheckSafetyAux(&statbuf)) {
+        fclose(fp);
+        fp = NULL;
+        return 0;
+    }
+    return 1;
+}
+
+/***************************************************************/
+/*                                                             */
+/*  CheckSafetyAux                                             */
+/*                                                             */
+/*  Returns 1 if file whos info is in statbuf is safe to read; */
+/*  0 otherwise.  If we are running as                         */
+/*  root, we refuse to open files not owned by root.           */
+/*  We also reject world-writable files, no matter             */
+/*  who we're running as.                                      */
+/*  As a side effect, if we don't own the file, or it's not    */
+/*  owned by a trusted user, we disable RUN                    */
+/***************************************************************/
+
+static int CheckSafetyAux(struct stat *statbuf)
+{
     /* Under UNIX, take extra precautions if running as root */
     if (!geteuid()) {
 	/* Reject files not owned by root or group/world writable */
-	if (statbuf.st_uid != 0) {
-	    fprintf(ErrFp, "SECURITY: Won't read non-root-owned file when running as root!\n");
-	    fclose(fp);
-	    fp = NULL;
+	if (statbuf->st_uid != 0) {
+	    fprintf(ErrFp, "SECURITY: Won't read non-root-owned file or directory when running as root!\n");
 	    return 0;
 	}
     }
     /* Sigh... /dev/null is usually world-writable, so ignore devices,
        FIFOs, sockets, etc. */
-    if (!S_ISREG(statbuf.st_mode)) {
+    if (!S_ISREG(statbuf->st_mode) && !S_ISDIR(statbuf->st_mode)) {
 	return 1;
     }
-    if ((statbuf.st_mode & S_IWOTH)) {
-	fprintf(ErrFp, "SECURITY: Won't read world-writable file!\n");
-	fclose(fp);
-	fp = NULL;
+    if ((statbuf->st_mode & S_IWOTH)) {
+	fprintf(ErrFp, "SECURITY: Won't read world-writable file or directory!\n");
 	return 0;
     }
 
@@ -1127,13 +1157,13 @@ static int CheckSafety(void)
 
     /* Assume unsafe */
     RunDisabled |= RUN_NOTOWNER;
-    if (statbuf.st_uid == geteuid()) {
+    if (statbuf->st_uid == geteuid()) {
         /* Owned by me... safe */
 	RunDisabled &= ~RUN_NOTOWNER;
     } else {
         int i;
         for (i=0; i<NumTrustedUsers; i++) {
-            if (statbuf.st_uid == TrustedUsers[i]) {
+            if (statbuf->st_uid == TrustedUsers[i]) {
                 /* Owned by a trusted user... safe */
                 RunDisabled &= ~RUN_NOTOWNER;
                 break;

src/globals.c

@@ -8,15 +8,17 @@
 /*  globals.h and err.h                                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
 #include "config.h"
 
-#include <stdio.h>   /* For defintion of FILE - sigh! */
+#include <stdio.h>   /* For definition of FILE - sigh! */
 #include "types.h"
 #include "custom.h"
+#include "lang.h"
 #define MK_GLOBALS 1
 #include "globals.h"
 #include "err.h"

src/globals.h

@@ -8,9 +8,11 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
+
 #ifdef MK_GLOBALS
 #undef EXTERN
 #define EXTERN
@@ -24,6 +26,10 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+EXTERN  FILE *ErrFp;
+
+#include "dynbuf.h"
+#include "lang.h"
 
 #define MAX_TRUSTED_USERS 20
 
@@ -33,9 +39,9 @@
 #define IsLeapYear(y) (((y) % 4) ? 0 : ((!((y) % 100) && ((y) % 400)) ? 0 : 1 ))
 #define DaysInMonth(m, y) ((m) != 1 ? MonthDays[m] : 28 + IsLeapYear(y))
 
-#define DestroyValue(x) (void) (((x).type == STR_TYPE && (x).v.str) ? (free((x).v.str),(x).type = ERR_TYPE) : 0)
+#define DestroyValue(x) (void) (((x).type == STR_TYPE && (x).v.str) ? (free((x).v.str),(x).v.str = NULL,(x).type = ERR_TYPE) : 0)
 
-EXTERN	int	JulianToday;
+EXTERN	int	DSEToday;
 EXTERN	int	RealToday;
 EXTERN	int	CurDay;
 EXTERN	int	CurMon;
@@ -53,9 +59,10 @@ EXTERN  INIT(   int     DoSimpleCalendar, 0);
 EXTERN  INIT(   int     DoSimpleCalDelta, 0);
 EXTERN  INIT(   int     DoPrefixLineNo, 0);
 EXTERN	INIT(	int	MondayFirst, 0);
+EXTERN  INIT(   int     AddBlankLines, 1);
 EXTERN	INIT(	int	Iterations, 1);
 EXTERN  INIT(   int     PsCal, 0);
-EXTERN  INIT(   int     CalWidth, -1);
+EXTERN  INIT(   int     CalWidth, 80);
 EXTERN  INIT(   int     CalWeeks, 0);
 EXTERN  INIT(   int     CalMonths, 0);
 EXTERN  INIT(	int 	Hush, 0);
@@ -75,6 +82,8 @@ EXTERN  INIT(   long    SysTime, -1L);
 EXTERN	char	const *InitialFile;
 EXTERN	int	FileAccessDate;
 
+EXTERN  INIT(   int     WeekdayOmits, 0);
+EXTERN  INIT(   int     DontSuppressQuoteMarkers, 0);
 EXTERN  INIT(	int 	DontFork, 0);
 EXTERN  INIT(	int 	DontQueue, 0);
 EXTERN  INIT(   int     NumQueued, 0);
@@ -94,7 +103,6 @@ EXTERN  INIT(	char	*FileName, NULL);
 EXTERN	INIT(	int	UseStdin, 0);
 EXTERN  INIT(   int     PurgeMode, 0);
 EXTERN  INIT(   int     PurgeIncludeDepth, 0);
-EXTERN  FILE *ErrFp;
 EXTERN  INIT(   FILE    *PurgeFP,  NULL);
 EXTERN  INIT(   int     NumIfs,    0);
 EXTERN  INIT(   unsigned int IfFlags,   0);
@@ -106,11 +114,13 @@ EXTERN  INIT(   int     LastTriggerTime, 0);
 EXTERN  INIT(   int     ShouldCache, 0);
 EXTERN  char const   *CurLine;
 EXTERN  INIT(   int     NumTriggered, 0);
+EXTERN  INIT(   int     DidMsgReminder, 0);
 EXTERN  int ArgC;
 EXTERN  char const **ArgV;
 EXTERN  INIT(   int     CalLines, CAL_LINES);
 EXTERN  INIT(   int     CalPad, 1);
 EXTERN  INIT(   int     UseVTChars, 0);
+EXTERN  INIT(   int     UseBGVTColors, 0);
 EXTERN  INIT(   int     UseUTF8Chars, 0);
 EXTERN  INIT(   int     UseVTColors, 0);
 EXTERN  INIT(   int     Use256Colors, 0);
@@ -141,11 +151,6 @@ EXTERN	INIT(	int	  SubsIndent, 0);
 EXTERN	INIT(	char	  *EndSent, ".?!");
 EXTERN	INIT(	char	  *EndSentIg, "\"')]}>");
 
-/* We need the language stuff here... */
-
-#include "lang.h"
-#include "dynbuf.h"
-
 EXTERN DynamicBuffer Banner;
 EXTERN DynamicBuffer LineBuffer;
 EXTERN DynamicBuffer ExprBuf;
@@ -227,3 +232,98 @@ EXTERN	int	MonthIndex[2][12]
 #endif
 ;
 
+EXTERN char *DynamicAgo
+#ifdef MK_GLOBALS
+= L_AGO
+#endif
+;
+EXTERN char *DynamicAm
+#ifdef MK_GLOBALS
+= L_AM
+#endif
+;
+EXTERN char *DynamicAnd
+#ifdef MK_GLOBALS
+= L_AND
+#endif
+;
+EXTERN char *DynamicAt
+#ifdef MK_GLOBALS
+= L_AT
+#endif
+;
+EXTERN char *DynamicFromnow
+#ifdef MK_GLOBALS
+= L_FROMNOW
+#endif
+;
+EXTERN char *DynamicHour
+#ifdef MK_GLOBALS
+= L_HOUR
+#endif
+;
+EXTERN char *DynamicHplu
+#ifdef MK_GLOBALS
+= L_HPLU
+#endif
+;
+EXTERN char *DynamicIs
+#ifdef MK_GLOBALS
+= L_IS
+#endif
+;
+EXTERN char *DynamicMinute
+#ifdef MK_GLOBALS
+= L_MINUTE
+#endif
+;
+EXTERN char *DynamicMplu
+#ifdef MK_GLOBALS
+= L_MPLU
+#endif
+;
+EXTERN char *DynamicNow
+#ifdef MK_GLOBALS
+= L_NOW
+#endif
+;
+EXTERN char *DynamicOn
+#ifdef MK_GLOBALS
+= L_ON
+#endif
+;
+EXTERN char *DynamicPm
+#ifdef MK_GLOBALS
+= L_PM
+#endif
+;
+EXTERN char *DynamicToday
+#ifdef MK_GLOBALS
+= L_TODAY
+#endif
+;
+EXTERN char *DynamicTomorrow
+#ifdef MK_GLOBALS
+= L_TOMORROW
+#endif
+;
+EXTERN char *DynamicWas
+#ifdef MK_GLOBALS
+= L_WAS
+#endif
+;
+
+#define XSTR(x) #x
+#define STRSYSDIR(x) XSTR(x)
+
+EXTERN char *SysDir
+#ifdef MK_GLOBALS
+= STRSYSDIR(SYSDIR)
+#endif
+;
+
+EXTERN int SuppressLRM
+#ifdef MK_GLOBALS
+= 0
+#endif
+;

src/hbcal.c

@@ -5,7 +5,8 @@
 /*  Support for the Hebrew calendar                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /*  Derived from code written by Amos Shapir in 1978; revised  */
 /*  1985.                                                      */
@@ -67,7 +68,7 @@ static char HebIsLeap[] = {0,0,1,0,0,1,0,1,0,0,1,0,0,1,0,0,1,0,1};
 /*                                                             */
 /*  RoshHashana                                                */
 /*                                                             */
-/*  Return the Julian date for Rosh Hashana of specified       */
+/*  Return DSE date for Rosh Hashana of specified              */
 /*  Hebrew year.  (ie, 5751, not 1990)                         */
 /*                                                             */
 /***************************************************************/
@@ -155,14 +156,14 @@ char const *DaysInHebMonths(int ylen)
 
 /***************************************************************/
 /*                                                             */
-/*  HebToJul                                                   */
+/*  HebToDSE                                                   */
 /*                                                             */
-/*  Convert a Hebrew date to Julian.                           */
+/*  Convert a Hebrew date to DSE.                              */
 /*  Hebrew months range from 0-12, but Adar A has 0 length in  */
 /*  non-leap-years.                                            */
 /*                                                             */
 /***************************************************************/
-int HebToJul(int hy, int hm, int hd)
+int HebToDSE(int hy, int hm, int hd)
 {
     int ylen;
     char const *monlens;
@@ -188,39 +189,39 @@ int HebToJul(int hy, int hm, int hd)
 
 /***************************************************************/
 /*                                                             */
-/*  JulToHeb                                                   */
+/*  DSEToHeb                                                   */
 /*                                                             */
-/*  Convert a Julian date to Hebrew.                           */
+/*  Convert a DSE to Hebrew.                                   */
 /*  Hebrew months range from 0-12, but Adar A has 0 length in  */
 /*  non-leap-years.                                            */
 /*                                                             */
 /***************************************************************/
-void JulToHeb(int jul, int *hy, int *hm, int *hd)
+void DSEToHeb(int dse, int *hy, int *hm, int *hd)
 {
     int y, m, d;
     int rh;
     int ylen;
     char const *monlen;
     /* Get the common year */
-    FromJulian(jul, &y, &m, &d);
+    FromDSE(dse, &y, &m, &d);
     y += 3763; /* Over-estimate a bit to be on the safe side below... */
 
     /* Find the RH just before desired date */
-    while ((rh=RoshHashana(y))>jul) y--;
+    while ((rh=RoshHashana(y))>dse) y--;
 
     /* Got the year - now find the month */
-    jul -= rh;
+    dse -= rh;
     ylen = DaysInHebYear(y);
     monlen = DaysInHebMonths(ylen);
     m = 0;
-    while((jul >= monlen[m]) || !monlen[m]) {
-	jul -= monlen[m];
+    while((dse >= monlen[m]) || !monlen[m]) {
+	dse -= monlen[m];
 	m++;
     }
 
     *hy = y;
     *hm = m;
-    *hd = jul+1;
+    *hd = dse+1;
 }
 
 /***************************************************************/
@@ -389,20 +390,20 @@ int GetValidHebDate(int yin, int min, int din, int adarbehave,
 /*  Returns 0 for success, non-zero for failure.               */
 /*                                                             */
 /***************************************************************/
-int GetNextHebrewDate(int julstart, int hm, int hd,
+int GetNextHebrewDate(int dsestart, int hm, int hd,
 			     int jahr, int adarbehave, int *ans)
 {
-    int r, yout, mout, dout, jul=1;
+    int r, yout, mout, dout, dse=1;
     int adarflag = adarbehave;
 
-    /* I initialize jul above to stop gcc from complaining about
+    /* I initialize dse above to stop gcc from complaining about
        possible use of uninitialized variable.  You can take it
        out if the small inefficiency really bothers you. */
 
     /* If adarbehave == ADAR2BOTH, set adarflag to ADAR2ADARA for now */
     if (adarbehave == ADAR2BOTH) adarflag = ADAR2ADARA;
 
-    JulToHeb(julstart, &yout, &mout, &dout);
+    DSEToHeb(dsestart, &yout, &mout, &dout);
 
     r = 1;
     while(r) {
@@ -419,9 +420,9 @@ int GetNextHebrewDate(int julstart, int hm, int hd,
 	    } else yout++;
 	    continue;
 	}
-	jul = HebToJul(yout, mout, dout);
-	if (jul < 0) return E_DATE_OVER;
-	if (jul >= julstart) break;
+	dse = HebToDSE(yout, mout, dout);
+	if (dse < 0) return E_DATE_OVER;
+	if (dse >= dsestart) break;
 	else {
 	    if (adarbehave == ADAR2BOTH && hm == ADAR) {
 		if (adarflag == ADAR2ADARA) {
@@ -434,7 +435,7 @@ int GetNextHebrewDate(int julstart, int hm, int hd,
 	    r=1;  /* Force loop to continue */
 	}
     }
-    *ans = jul;
+    *ans = dse;
     return OK;
 }
 

src/init.c

@@ -7,7 +7,8 @@
 /*  in normal mode.                                            */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -21,6 +22,10 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -30,10 +35,10 @@
 #endif
 
 #include "types.h"
+#include "globals.h"
 #include "protos.h"
 #include "expr.h"
 #include "err.h"
-#include "globals.h"
 
 /***************************************************************
  *
@@ -43,7 +48,8 @@
  *             simple calendar format.
  *  -r       = Disallow RUN mode
  *  -c[n]    = Produce a calendar for n months (default = 1)
- *  -@[n,m]  = Colorize n=0 VT100 n=1 85 n=2 True m=0 dark terminal m=1 light
+ *  -@[n,m,b]= Colorize n=0 VT100 n=1 85 n=2 True m=0 dark terminal m=1 light
+ *             b=0 ignore SHADE b=1 respect SHADE
  *  -w[n,n,n] = Specify output device width, padding and spacing
  *  -s[n]    = Produce calendar in "simple calendar" format
  *  -p[n]    = Produce calendar in format compatible with rem2ps
@@ -94,6 +100,25 @@ static void AddTrustedUser(char const *username);
 
 static DynamicBuffer default_filename_buf;
 
+static void
+InitCalWidthAndFormWidth(int fd)
+{
+    struct winsize w;
+
+    if (!isatty(fd)) {
+        return;
+    }
+    if (ioctl(fd, TIOCGWINSZ, &w) == 0) {
+        CalWidth = w.ws_col;
+        if (CalWidth < 71) {
+            CalWidth = 71;
+        }
+        FormWidth = w.ws_col - 8;
+        if (FormWidth < 20) FormWidth = 20;
+        if (FormWidth > 500) FormWidth = 500;
+    }
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DefaultFilename                                            */
@@ -140,21 +165,15 @@ void InitRemind(int argc, char const *argv[])
     char const *s;
     int weeks;
     int x;
-    int jul;
+    int dse;
+    int ttyfd;
 
-    jul = NO_DATE;
+    dse = NO_DATE;
 
     /* If stdout is a terminal, initialize $FormWidth to terminal width-8,
        but clamp to [20, 500] */
-    if (isatty(STDOUT_FILENO)) {
-	struct winsize w;
-	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0) {
-	    FormWidth = w.ws_col - 8;
-	    if (FormWidth < 20) FormWidth = 20;
-	    if (FormWidth > 500) FormWidth = 500;
-	}
-    }
-    
+    InitCalWidthAndFormWidth(STDOUT_FILENO);
+
     /* Initialize global dynamic buffers */
     DBufInit(&Banner);
     DBufInit(&LineBuffer);
@@ -181,8 +200,8 @@ void InitRemind(int argc, char const *argv[])
 	fprintf(ErrFp, ErrMsg[M_BAD_SYS_DATE], BASE);
 	exit(EXIT_FAILURE);
     }
-    JulianToday = RealToday;
-    FromJulian(JulianToday, &CurYear, &CurMon, &CurDay);
+    DSEToday = RealToday;
+    FromDSE(DSEToday, &CurYear, &CurMon, &CurDay);
 
     /* Initialize Latitude and Longitude */
     set_components_from_lat_and_long();
@@ -232,17 +251,37 @@ void InitRemind(int argc, char const *argv[])
 			Use256Colors = 1;
 		    } else if (x == 2) {
 			UseTrueColors = 1;
-		    }
+		    } else if (x != 0) {
+                        fprintf(ErrFp, "%s: -@n,m,b: n must be 0, 1 or 2 (assuming 0)\n",
+                                argv[0]);
+                    }
 		}
 		if (*arg == ',') {
 		    arg++;
-		    PARSENUM(x, arg);
-		    if (x == 0) {
-			TerminalBackground = TERMINAL_BACKGROUND_DARK;
-		    } else if (x == 1) {
-			TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
-		    }
+                    if (*arg != ',') {
+                        PARSENUM(x, arg);
+                        if (x == 0) {
+                            TerminalBackground = TERMINAL_BACKGROUND_DARK;
+                        } else if (x == 1) {
+                            TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+                        } else if (x == 2) {
+                            TerminalBackground = TERMINAL_BACKGROUND_UNKNOWN;
+                        } else {
+                            fprintf(ErrFp, "%s: -@n,m,b: m must be 0, 1 or 2 (assuming 2)\n",
+                                    argv[0]);
+                        }
+                    }
 		}
+                if (*arg == ',') {
+		    arg++;
+                    PARSENUM(x, arg);
+                    if (x != 0 && x != 1) {
+                        fprintf(ErrFp, "%s: -@n,m,b: b must be 0 or 1 (assuming 0)\n",
+                                argv[0]);
+                        x = 0;
+                    }
+                    UseBGVTColors = x;
+                }
 		break;
 
 	    case 'j':
@@ -459,6 +498,7 @@ void InitRemind(int argc, char const *argv[])
 		DoSimpleCalendar = 1;
 		PsCal = PSCAL_LEVEL1;
 		while (*arg == 'a' || *arg == 'A' ||
+                       *arg == 'q' || *arg == 'Q' ||
 		       *arg == 'p' || *arg == 'P') {
 		    if (*arg == 'a' || *arg == 'A') {
 			DoSimpleCalDelta = 1;
@@ -471,7 +511,9 @@ void InitRemind(int argc, char const *argv[])
 			} else {
 			    PsCal = PSCAL_LEVEL3;
 			}
-		    }
+		    } else if (*arg == 'q' || *arg == 'Q') {
+                        DontSuppressQuoteMarkers = 1;
+                    }
 		    arg++;
 		}
 		PARSENUM(CalMonths, arg);
@@ -486,11 +528,27 @@ void InitRemind(int argc, char const *argv[])
 	    case 'w':
 	    case 'W':
 		if (*arg != ',') {
-		    PARSENUM(CalWidth, arg);
-		    if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
-		    if (CalWidth == 0) {
-			CalWidth = -1;
-		    }
+                    if (*arg == 't') {
+                        arg++;
+                        /* -wt means get width from /dev/tty */
+                        ttyfd = open("/dev/tty", O_RDONLY);
+                        if (!ttyfd) {
+                            fprintf(stderr, "%s: `-wt': Cannot open /dev/tty: %s\n",
+                                    argv[0], strerror(errno));
+                        } else {
+                            InitCalWidthAndFormWidth(ttyfd);
+                            close(ttyfd);
+                        }
+                    } else {
+                        PARSENUM(CalWidth, arg);
+                        if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
+                        if (CalWidth == 0) {
+                            CalWidth = -1;
+                        }
+                        FormWidth = CalWidth - 8;
+                        if (FormWidth < 20) FormWidth = 20;
+                        if (FormWidth > 500) FormWidth = 500;
+                    }
 		}
 		if (*arg == ',') {
 		    arg++;
@@ -581,30 +639,30 @@ void InitRemind(int argc, char const *argv[])
 
 	    case T_DateTime:
 		if (SysTime != -1L) Usage();
-		if (m != NO_MON || d != NO_DAY || y != NO_YR || jul != NO_DATE) Usage();
+		if (m != NO_MON || d != NO_DAY || y != NO_YR || dse != NO_DATE) Usage();
 		SysTime = (tok.val % MINUTES_PER_DAY) * 60;
 		DontQueue = 1;
 		Daemon = 0;
-		jul = tok.val / MINUTES_PER_DAY;
+		dse = tok.val / MINUTES_PER_DAY;
 		break;
 
 	    case T_Date:
-		if (m != NO_MON || d != NO_DAY || y != NO_YR || jul != NO_DATE) Usage();
-		jul = tok.val;
+		if (m != NO_MON || d != NO_DAY || y != NO_YR || dse != NO_DATE) Usage();
+		dse = tok.val;
 		break;
 
 	    case T_Month:
-		if (m != NO_MON || jul != NO_DATE) Usage();
+		if (m != NO_MON || dse != NO_DATE) Usage();
 		else m = tok.val;
 		break;
 
 	    case T_Day:
-		if (d != NO_DAY || jul != NO_DATE) Usage();
+		if (d != NO_DAY || dse != NO_DATE) Usage();
 		else d = tok.val;
 		break;
 
 	    case T_Year:
-		if (y != NO_YR || jul != NO_DATE) Usage();
+		if (y != NO_YR || dse != NO_DATE) Usage();
 		else y = tok.val;
 		break;
 
@@ -624,8 +682,8 @@ void InitRemind(int argc, char const *argv[])
 	    Daemon = 0;
 	}
 
-	if (jul != NO_DATE) {
-	    FromJulian(jul, &y, &m, &d);
+	if (dse != NO_DATE) {
+	    FromDSE(dse, &y, &m, &d);
 	}
 /* Must supply date in the form:  day, mon, yr OR mon, yr */
 	if (m != NO_MON || y != NO_YR || d != NO_DAY) {
@@ -643,22 +701,22 @@ void InitRemind(int argc, char const *argv[])
 		fprintf(ErrFp, "%s", BadDate);
 		Usage();
 	    }
-	    JulianToday = Julian(y, m, d);
-	    if (JulianToday == -1) {
+	    DSEToday = DSE(y, m, d);
+	    if (DSEToday == -1) {
 		fprintf(ErrFp, "%s", BadDate);
 		Usage();
 	    }
 	    CurYear = y;
 	    CurMon = m;
 	    CurDay = d;
-	    if (JulianToday != RealToday) IgnoreOnce = 1;
+	    if (DSEToday != RealToday) IgnoreOnce = 1;
 	}
 
     }
 
 /* Figure out the offset from UTC */
     if (CalculateUTC)
-	(void) CalcMinsFromUTC(JulianToday, SystemTime(0)/60,
+	(void) CalcMinsFromUTC(DSEToday, SystemTime(0)/60,
 			       &MinsFromUTC, NULL);
 }
 
@@ -672,7 +730,7 @@ void InitRemind(int argc, char const *argv[])
 #ifndef L_USAGE_OVERRIDE
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2023 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif
@@ -680,7 +738,7 @@ void Usage(void)
     fprintf(ErrFp, "Options:\n");
     fprintf(ErrFp, " -n     Output next occurrence of reminders in simple format\n");
     fprintf(ErrFp, " -r     Disable RUN directives\n");
-    fprintf(ErrFp, " -@[n,m] Colorize COLOR reminders\n");
+    fprintf(ErrFp, " -@[n,m,b] Colorize COLOR/SHADE reminders\n");
     fprintf(ErrFp, " -c[a][n] Produce a calendar for n (default 1) months\n");
     fprintf(ErrFp, " -c[a]+[n] Produce a calendar for n (default 1) weeks\n");
     fprintf(ErrFp, " -w[n[,p[,s]]]  Specify width, padding and spacing of calendar\n");

src/json.c

@@ -249,7 +249,7 @@ json_value * json_parse_ex (json_settings * settings,
    const json_char * end;
    json_value * top, * root, * alloc = 0;
    json_state state = { 0 };
-   long flags = 0;
+   long flags;
    double num_digits = 0, num_e = 0;
    double num_fraction = 0;
 
@@ -299,7 +299,7 @@ json_value * json_parse_ex (json_settings * settings,
 	 if (flags & flag_string)
 	 {
 	    if (!b)
-	    {  sprintf (error, "Unexpected EOF in string (at %d:%d)", line_and_col);
+	    {  sprintf (error, "Unexpected EOF in string (at %u:%u)", line_and_col);
 	       goto e_failed;
 	    }
 
@@ -325,7 +325,7 @@ json_value * json_parse_ex (json_settings * settings,
 			(uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
 			(uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
 		    {
-			sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+			sprintf (error, "Invalid character value `%c` (at %u:%u)", b, line_and_col);
 			goto e_failed;
 		    }
 
@@ -342,7 +342,7 @@ json_value * json_parse_ex (json_settings * settings,
 			    (uc_b3 = hex_value (*++ state.ptr)) == 0xFF ||
 			    (uc_b4 = hex_value (*++ state.ptr)) == 0xFF)
 			{
-			    sprintf (error, "Invalid character value `%c` (at %d:%d)", b, line_and_col);
+			    sprintf (error, "Invalid character value `%c` (at %u:%u)", b, line_and_col);
 			    goto e_failed;
 			}
 
@@ -472,7 +472,7 @@ json_value * json_parse_ex (json_settings * settings,
 	       if (flags & flag_block_comment)
 	       {
 		  if (!b)
-		  {  sprintf (error, "%d:%d: Unexpected EOF in block comment", line_and_col);
+		  {  sprintf (error, "%u:%u: Unexpected EOF in block comment", line_and_col);
 		     goto e_failed;
 		  }
 
@@ -488,12 +488,12 @@ json_value * json_parse_ex (json_settings * settings,
 	    else if (b == '/')
 	    {
 	       if (! (flags & (flag_seek_value | flag_done)) && top->type != json_object)
-	       {  sprintf (error, "%d:%d: Comment not allowed here", line_and_col);
+	       {  sprintf (error, "%u:%u: Comment not allowed here", line_and_col);
 		  goto e_failed;
 	       }
 
 	       if (++ state.ptr == end)
-	       {  sprintf (error, "%d:%d: EOF unexpected", line_and_col);
+	       {  sprintf (error, "%u:%u: EOF unexpected", line_and_col);
 		  goto e_failed;
 	       }
 
@@ -508,7 +508,7 @@ json_value * json_parse_ex (json_settings * settings,
 		     continue;
 
 		  default:
-		     sprintf (error, "%d:%d: Unexpected `%c` in comment opening sequence", line_and_col, b);
+		     sprintf (error, "%u:%u: Unexpected `%c` in comment opening sequence", line_and_col, b);
 		     goto e_failed;
 	       };
 	    }
@@ -526,7 +526,7 @@ json_value * json_parse_ex (json_settings * settings,
 
 	       default:
 
-		  sprintf (error, "%d:%d: Trailing garbage: `%c`",
+		  sprintf (error, "%u:%u: Trailing garbage: `%c`",
 			   state.cur_line, state.cur_col, b);
 
 		  goto e_failed;
@@ -545,7 +545,7 @@ json_value * json_parse_ex (json_settings * settings,
 		  if (top && top->type == json_array)
 		     flags = (flags & ~ (flag_need_comma | flag_seek_value)) | flag_next;
 		  else
-		  {  sprintf (error, "%d:%d: Unexpected ]", line_and_col);
+		  {  sprintf (error, "%u:%u: Unexpected ]", line_and_col);
 		     goto e_failed;
 		  }
 
@@ -561,7 +561,7 @@ json_value * json_parse_ex (json_settings * settings,
 		     }
 		     else
 		     {
-			sprintf (error, "%d:%d: Expected , before %c",
+			sprintf (error, "%u:%u: Expected , before %c",
 				 state.cur_line, state.cur_col, b);
 
 			goto e_failed;
@@ -576,7 +576,7 @@ json_value * json_parse_ex (json_settings * settings,
 		     }
 		     else
 		     {
-			sprintf (error, "%d:%d: Expected : before %c",
+			sprintf (error, "%u:%u: Expected : before %c",
 				 state.cur_line, state.cur_col, b);
 
 			goto e_failed;
@@ -702,7 +702,7 @@ json_value * json_parse_ex (json_settings * settings,
 			   continue;
 			}
 			else
-			{  sprintf (error, "%d:%d: Unexpected %c when seeking value", line_and_col, b);
+			{  sprintf (error, "%u:%u: Unexpected %c when seeking value", line_and_col, b);
 			   goto e_failed;
 			}
 		  };
@@ -722,7 +722,7 @@ json_value * json_parse_ex (json_settings * settings,
 		  case '"':
 
 		     if (flags & flag_need_comma)
-		     {  sprintf (error, "%d:%d: Expected , before \"", line_and_col);
+		     {  sprintf (error, "%u:%u: Expected , before \"", line_and_col);
 			goto e_failed;
 		     }
 
@@ -747,7 +747,7 @@ json_value * json_parse_ex (json_settings * settings,
 		     }
 		     /* FALLTHROUGH */
 		  default:
-		     sprintf (error, "%d:%d: Unexpected `%c` in object", line_and_col, b);
+		     sprintf (error, "%u:%u: Unexpected `%c` in object", line_and_col, b);
 		     goto e_failed;
 	       };
 
@@ -765,7 +765,7 @@ json_value * json_parse_ex (json_settings * settings,
 		     if (! (flags & flag_num_e))
 		     {
 			if (flags & flag_num_zero)
-			{  sprintf (error, "%d:%d: Unexpected `0` before `%c`", line_and_col, b);
+			{  sprintf (error, "%u:%u: Unexpected `0` before `%c`", line_and_col, b);
 			   goto e_failed;
 			}
 
@@ -814,7 +814,7 @@ json_value * json_parse_ex (json_settings * settings,
 	       else if (b == '.' && top->type == json_integer)
 	       {
 		  if (!num_digits)
-		  {  sprintf (error, "%d:%d: Expected digit before `.`", line_and_col);
+		  {  sprintf (error, "%u:%u: Expected digit before `.`", line_and_col);
 		     goto e_failed;
 		  }
 
@@ -831,7 +831,7 @@ json_value * json_parse_ex (json_settings * settings,
 		  if (top->type == json_double)
 		  {
 		     if (!num_digits)
-		     {  sprintf (error, "%d:%d: Expected digit after `.`", line_and_col);
+		     {  sprintf (error, "%u:%u: Expected digit after `.`", line_and_col);
 			goto e_failed;
 		     }
 
@@ -857,11 +857,11 @@ json_value * json_parse_ex (json_settings * settings,
 	       else
 	       {
 		  if (!num_digits)
-		  {  sprintf (error, "%d:%d: Expected digit after `e`", line_and_col);
+		  {  sprintf (error, "%u:%u: Expected digit after `e`", line_and_col);
 		     goto e_failed;
 		  }
 
-		  top->u.dbl *= pow (10.0, (flags & flag_num_e_negative ? - num_e : num_e));
+		  top->u.dbl *= pow (10.0, ((flags & flag_num_e_negative) ? - num_e : num_e));
 	       }
 
 	       if (flags & flag_num_negative)
@@ -942,7 +942,7 @@ json_value * json_parse_ex (json_settings * settings,
 
 e_unknown_value:
 
-   sprintf (error, "%d:%d: Unknown value", line_and_col);
+   sprintf (error, "%u:%u: Unknown value", line_and_col);
    goto e_failed;
 
 e_alloc_failure:
@@ -952,7 +952,7 @@ e_alloc_failure:
 
 e_overflow:
 
-   sprintf (error, "%d:%d: Too long (caught overflow)", line_and_col);
+   sprintf (error, "%u:%u: Too long (caught overflow)", line_and_col);
    goto e_failed;
 
 e_failed:

src/lang.h

@@ -5,7 +5,8 @@
 /*  Header file for language support for various languages.    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -23,7 +24,7 @@
 #define ITALIAN    9 /* translated by Valerio Aimale                   */
 #define ROMANIAN  10 /* translated by Liviu Daia                       */
 #define SPANISH   11 /* translated by Rafa Couto                       */
-#define ICELANDIC 12 /* translated by Björn Davíðsson                  */
+#define ICELANDIC 12 /* translated by Björn Davíðsson                  */
 
 /* Add more languages here - but please e-mail dianne@skoll.ca
    to have your favorite language assigned a number.  If you add a

src/langs/danish.h

@@ -6,8 +6,9 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  REMIND is Copyright (C) 1992-2023 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Mogens Lynnerup.        */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -48,9 +49,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "siden"
 #define L_FROMNOW "fra nu"
@@ -83,13 +81,11 @@
 
 #define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<5) ? " om natten" : " om formiddagen" : (hour > 17) ? " om aftenen" : " om eftermiddagen";
 #define L_ORDINAL_OVERRIDE		plu = ".";
-#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
+#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[dse%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[dse%7], d, MonthName[m], y); }
 #define L_E_OVER                        sprintf(s, "den %02d%c%02d%c%04d", d, DateSep, m+1, DateSep, y);
 #define L_F_OVER                        sprintf(s, "den %02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
-#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[dse%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[dse%7], d, MonthName[m]); }
 #define L_H_OVER                        sprintf(s, "den %02d%c%02d", d, DateSep, m+1);
 #define L_I_OVER                        sprintf(s, "den %02d%c%02d", m+1, DateSep, d);
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
-
-#endif /* L_IN_DOSUBST */

src/langs/dutch.h

@@ -11,7 +11,8 @@
 /*  Further corrections by Erik-Jan Vens                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -52,9 +53,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "geleden"
 #define L_FROMNOW "vanaf nu"
@@ -91,15 +89,14 @@ if (tdiff == 0) \
 sprintf(s, L_NOW); \
 else if (hdiff == 0) \
 sprintf(s, "%d %s %s", mdiff, \
-	(mdiff == 1 ? "minuut" : "minuten"), when); \
+        ((mdiff == 1) ? "minuut" : "minuten"), when);   \
 else if (mdiff == 0) \
 sprintf(s, "%d %s %s", hdiff, \
-	(mdiff == 1 ? "uur" : "uren"), when); \
-	else sprintf(s, "%d %s %s %d %s %s", hdiff, \
-		     (hdiff == 1 ? "uur" : "uren"), \
-		     L_AND, mdiff, \
-		     (mdiff == 1 ? "minuut" : "minuten"), \
-		     when);
+        ((hdiff == 1) ? "uur" : "uren"), when); \
+else sprintf(s, "%d %s %s %d %s %s", hdiff, \
+	     (hdiff == 1 ? "uur" : "uren"), \
+	     L_AND, mdiff, \
+	     (mdiff == 1 ? "minuut" : "minuten"), \
+	     when);
 
-#endif /* L_IN_DOSUBST */
 

src/langs/english.h

@@ -5,7 +5,8 @@
 /*  Support for the English language.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -46,9 +47,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "ago"
 #define L_FROMNOW "from now"
@@ -72,11 +70,9 @@
 #define L_WAS "was"
 #define L_AND "and"
 /* What to add to make "hour" plural */
-#define L_HPLU "s"  
+#define L_HPLU "s"
 /* What to add to make "minute" plural */
 #define L_MPLU "s"
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
-
-#endif /* L_IN_DOSUBST */

src/langs/finnish.h

@@ -11,7 +11,8 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993-1998 by Mikko Silvonen.    */
-/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  REMIND is Copyright (C) 1992-2023 by Dianne Skoll          */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -52,9 +53,6 @@
 #define L_AM " ap."
 #define L_PM " ip."
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "sitten"
 #define L_FROMNOW "kuluttua"
@@ -106,19 +104,19 @@
        default: plu = ":ntenä"; break; \
      } \
 }
-#define L_A_OVER if (altmode == '*') { sprintf(s, "%s %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s%s %d. %s%s %d", DayName[jul%7], L_ON, d, MonthName[m], L_PARTIT, y); }
-#define L_C_OVER if (altmode == '*') { sprintf(s, "%s", DayName[jul%7]); } else { sprintf(s, "%s%s", DayName[jul%7], L_ON); }
+#define L_A_OVER if (altmode == '*') { sprintf(s, "%s %d. %s %d", DayName[dse%7], d, MonthName[m], y); } else { sprintf(s, "%s%s %d. %s%s %d", DayName[dse%7], L_ON, d, MonthName[m], L_PARTIT, y); }
+#define L_C_OVER if (altmode == '*') { sprintf(s, "%s", DayName[dse%7]); } else { sprintf(s, "%s%s", DayName[dse%7], L_ON); }
 #define L_E_OVER sprintf(s, "%02d%c%02d%c%04d", d, DateSep, m+1, DateSep, y);
 #define L_F_OVER sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
-#define L_G_OVER if (altmode == '*') { sprintf(s, "%s %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s%s %d. %s%s", DayName[jul%7], L_ON, d, MonthName[m], L_PARTIT); }
+#define L_G_OVER if (altmode == '*') { sprintf(s, "%s %d. %s", DayName[dse%7], d, MonthName[m]); } else { sprintf(s, "%s%s %d. %s%s", DayName[dse%7], L_ON, d, MonthName[m], L_PARTIT); }
 #define L_H_OVER sprintf(s, "%02d%c%02d", d, DateSep, m+1);
 #define L_I_OVER sprintf(s, "%02d%c%02d", m+1, DateSep, d);
-#define L_J_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s %d", DayName[jul%7], MonthName[m], d, plu, y); } else { sprintf(s, "%s%s %sn %d%s %d", DayName[jul%7], L_ON, MonthName[m], d, plu, y); }
-#define L_K_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s", DayName[jul%7], MonthName[m], d, plu); } else { sprintf(s, "%s%s %sn %d%s", DayName[jul%7], L_ON, MonthName[m], d, plu); }
+#define L_J_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s %d", DayName[dse%7], MonthName[m], d, plu, y); } else { sprintf(s, "%s%s %sn %d%s %d", DayName[dse%7], L_ON, MonthName[m], d, plu, y); }
+#define L_K_OVER if (altmode == '*') { sprintf(s, "%s %sn %d%s", DayName[dse%7], MonthName[m], d, plu); } else { sprintf(s, "%s%s %sn %d%s", DayName[dse%7], L_ON, MonthName[m], d, plu); }
 #define L_L_OVER sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
 #define L_Q_OVER sprintf(s, "n");
-#define L_U_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s %d", DayName[jul%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s%s %d%s %s%s %d", DayName[jul%7], L_ON, d, plu, MonthName[m], L_PARTIT, y); }
-#define L_V_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s", DayName[jul%7], d, plu, MonthName[m]); } else { sprintf(s, "%s%s %d%s %s%s", DayName[jul%7], L_ON, d, plu, MonthName[m], L_PARTIT); }
+#define L_U_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s %d", DayName[dse%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s%s %d%s %s%s %d", DayName[dse%7], L_ON, d, plu, MonthName[m], L_PARTIT, y); }
+#define L_V_OVER if (altmode == '*') { sprintf(s, "%s %d%s %s", DayName[dse%7], d, plu, MonthName[m]); } else { sprintf(s, "%s%s %d%s %s%s", DayName[dse%7], L_ON, d, plu, MonthName[m], L_PARTIT); }
 #define L_1_OVER \
 if (tdiff == 0) \
   sprintf(s, "%s", L_NOW); \
@@ -138,7 +136,6 @@ else { \
    } \
    sprintf(s + strlen(s), when); \
 }
-#endif /* L_IN_DOSUBST */
 
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
@@ -199,7 +196,7 @@ EXTERN char *ErrMsg[] =
     "Kuukausi annettu kahdesti",
     "Päivä annettu kahdesti",
     "Tuntematon sana tai merkki",
-    "OMIT-komennossa on annettava kuukausi ja päivä",
+    "OMIT-komennossa on annettava kuukausi",
     "Liian monta osittaista OMIT-komentoa",
     "Liian monta täydellistä OMIT-komentoa",
     "Varoitus: PUSH-OMIT-CONTEXT ilman POP-OMIT-CONTEXTia",
@@ -257,7 +254,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2023 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETAVERSIO <<<<\n");
 #endif

src/langs/french.h

@@ -8,9 +8,10 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  REMIND is Copyright (C) 1992-2023 by Dianne Skoll          */
 /*  This file is Copyright (C) 1993 by Laurent Duperval and    */
 /*  Dianne Skoll.                                              */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -51,9 +52,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "il y a"
 #define L_FROMNOW "dans"
@@ -109,11 +107,9 @@ else if (tdiff < 0) { \
       sprintf(s, "dans %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
 }
 
-#define L_J_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s, %d", DayName[jul%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d, plu, MonthName[m], y); }
+#define L_J_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s, %d", DayName[dse%7], d, plu, MonthName[m], y); } else { sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[dse%7], d, plu, MonthName[m], y); }
 
-#define L_K_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s", DayName[jul%7], d, plu, MonthName[m]); } else { sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu, MonthName[m]); }
-
-#endif /* L_IN_DOSUBST */
+#define L_K_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s", DayName[dse%7], d, plu, MonthName[m]); } else { sprintf(s, "%s %s, %d%s %s", L_ON, DayName[dse%7], d, plu, MonthName[m]); }
 
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
@@ -232,7 +228,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2023 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif

src/langs/german.h

@@ -9,7 +9,8 @@
 /*  I don't speak German.                                      */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -50,9 +51,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "vorher"
 #define L_FROMNOW "von heute"
@@ -84,9 +82,7 @@
    See the file dosubst.c for more info. */
 #define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<5) ? " nachts" : " vormittags" : (hour > 17) ? " abends" : " nachmittags";
 #define L_ORDINAL_OVERRIDE		plu = ".";
-#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
-#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
+#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[dse%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[dse%7], d, MonthName[m], y); }
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[dse%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[dse%7], d, MonthName[m]); }
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
-
-#endif /* L_IN_DOSUBST */

src/langs/icelandic.h

@@ -5,8 +5,9 @@
 /*  Support for the Icelandic language.                        */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
-/*  Translated by Björn Davíðsson (bjossi@snerpa.is)           */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  Translated by Björn Davíðsson (bjossi@snerpa.is)           */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -15,59 +16,56 @@
 
 /* Day names */
 #define L_SUNDAY "sunnudagur"
-#define L_MONDAY "mánudagur"
-#define L_TUESDAY "þriðjudagur"
-#define L_WEDNESDAY "miðvikudagur"
+#define L_MONDAY "mánudagur"
+#define L_TUESDAY "þriðjudagur"
+#define L_WEDNESDAY "miðvikudagur"
 #define L_THURSDAY "fimmtudagur"
-#define L_FRIDAY "föstudagur"
+#define L_FRIDAY "föstudagur"
 #define L_SATURDAY "laugardagur"
 
 /* Month names */
-#define L_JAN "janúar"
-#define L_FEB "febrúar"
+#define L_JAN "janúar"
+#define L_FEB "febrúar"
 #define L_MAR "mars"
-#define L_APR "apríl"
-#define L_MAY "maí"
-#define L_JUN "júní"
-#define L_JUL "júlí"
-#define L_AUG "ágúst"
+#define L_APR "apríl"
+#define L_MAY "maí"
+#define L_JUN "júní"
+#define L_JUL "júlí"
+#define L_AUG "ágúst"
 #define L_SEP "september"
-#define L_OCT "október"
-#define L_NOV "nóvember"
+#define L_OCT "október"
+#define L_NOV "nóvember"
 #define L_DEC "desember"
 
 /* Today and tomorrow */
-#define L_TODAY "í dag"
-#define L_TOMORROW "á morgun"
+#define L_TODAY "í dag"
+#define L_TOMORROW "á morgun"
 
 /* The default banner */
-#define L_BANNER "Minnisatriði: %w, %d%s %m, %y%o:"
+#define L_BANNER "Minnisatriði: %w, %d%s %m, %y%o:"
 
 /* "am" and "pm" */
 #define L_AM "fh"
 #define L_PM "eh"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
-#define L_AGO "síðan"
-#define L_FROMNOW "frá því nú"
+#define L_AGO "síðan"
+#define L_FROMNOW "frá því nú"
 
 /* "in %d days' time" */
 #define L_INXDAYS "eftir %d daga"
 
 /* "on" as in "on date..." */
-#define L_ON "þann"
+#define L_ON "þann"
 
 /* Pluralizing - this is a problem for many languages and may require
    a more drastic fix */
 #define L_PLURAL "a"
 
 /* Minutes, hours, at, etc */
-#define L_NOW "núna"
+#define L_NOW "núna"
 #define L_AT "kl."
-#define L_MINUTE "mínútu"
+#define L_MINUTE "mínútu"
 #define L_HOUR "klukkustund"
 #define L_IS "er"
 #define L_WAS "var"
@@ -79,5 +77,3 @@
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
-
-#endif /* L_IN_DOSUBST */

src/langs/italian.h

@@ -7,7 +7,8 @@
 /*  This file is part of REMIND.                               */
 /*  It is Copyright (C) 1996 by Valerio Aimale                 */
 /*                                                             */
-/*  Remind is copyright (C) 1992-2021 by Dianne Skoll          */
+/*  Remind is copyright (C) 1992-2023 by Dianne Skoll          */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -49,9 +50,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "fa"
 #define L_FROMNOW "da oggi"
@@ -87,33 +85,30 @@
 #define L_HPLU_OVER	hplu = (hdiff == 1 ? "a" : "e");
 #define L_MPLU_OVER	mplu = (mdiff == 1 ? "o" : "i");
 
-#define L_A_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d,\
+#define L_A_OVER	sprintf(s, "%s, %d %s %d", DayName[dse%7], d,\
                                 MonthName[m], y);
-#define L_C_OVER	sprintf(s, "%s", DayName[jul%7]);
+#define L_C_OVER	sprintf(s, "%s", DayName[dse%7]);
 
 #define L_E_OVER	sprintf(s, "%02d%c%02d%c%04d", d, DateSep,\
                                  m+1, DateSep, y);
 
 #define L_F_OVER	sprintf(s, "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
 
-#define L_G_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
+#define L_G_OVER	sprintf(s, "%s, %d %s", DayName[dse%7], d, MonthName[m]);
 
 #define L_H_OVER	sprintf(s, "%02d%c%02d", d, DateSep, m+1);
 
 #define L_I_OVER	sprintf(s, "%02d%c%02d", m+1, DateSep, d);
 
-#define L_J_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d, \
+#define L_J_OVER	sprintf(s, "%s, %d %s %d", DayName[dse%7], d, \
                                 MonthName[m], y);
 
-#define L_K_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, \
+#define L_K_OVER	sprintf(s, "%s, %d %s", DayName[dse%7], d, \
                                 MonthName[m]);
 #define L_L_OVER	sprintf(s, "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
 
-#define L_U_OVER	sprintf(s, "%s, %d %s %d", DayName[jul%7], d, \
+#define L_U_OVER	sprintf(s, "%s, %d %s %d", DayName[dse%7], d, \
                                 MonthName[m], y);
 
-#define L_V_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, \
+#define L_V_OVER	sprintf(s, "%s, %d %s", DayName[dse%7], d, \
                                 MonthName[m]);
-
-
-#endif /* L_IN_DOSUBST */

src/langs/norwgian.h

@@ -6,7 +6,8 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*  This file is Copyright (C) 1993 by Trygve Randen.          */
-/*  Remind is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  Remind is Copyright (C) 1992-2023 by Dianne Skoll          */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -47,9 +48,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "siden"
 #define L_FROMNOW "fra nå"
@@ -80,10 +78,7 @@
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
 #define L_ORDINAL_OVERRIDE              plu = ".";
-#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
-#define L_G_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
+#define L_A_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s %d", DayName[dse%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, den %d. %s %d", L_ON, DayName[dse%7], d, MonthName[m], y); }
+#define L_G_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[dse%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[dse%7], d, MonthName[m]); }
 #define L_U_OVER                        L_A_OVER
 #define L_V_OVER                        L_G_OVER
-
-
-#endif /* L_IN_DOSUBST */

src/langs/polish.h

@@ -9,7 +9,8 @@
 /*  Polish.                                                    */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -50,9 +51,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "temu"
 #define L_FROMNOW "od teraz"
@@ -75,13 +73,17 @@
 #  define L_IS "będzie"
 #  define L_WAS "było"
 #define L_AND "i"
+
+#define L_HPLU ""
+#define L_MPLU ""
+
 /* What to add to make "hour" or "minute" plural */
 #define L_NPLU( N ) ((N == 1) ? "ę" : ((N==12) || (N==13) || (N==14)) ? "" : \
      ((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
 /* What to add to make "hour" plural */
-#define L_HPLU L_NPLU( hdiff )
+#define L_HPLU_OVER hplu = L_NPLU( hdiff );
 /* What to add to make "minute" plural */
-#define L_MPLU L_NPLU( mdiff )
+#define L_MPLU_OVER mplu = L_NPLU( mdiff );
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
@@ -94,37 +96,35 @@ ampm = (hour<12) ? \
      : (hour<22) ? " wieczorem" \
      : " w nocy";
 #define L_ORDINAL_OVERRIDE		plu = "";
-#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s %d", DayName[jul%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, %d. %s %d", L_ON, DayName[jul%7], d, MonthName[m], y); }
-#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
+#define L_A_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s %d", DayName[dse%7], d, MonthName[m], y); } else { sprintf(s, "%s %s, %d. %s %d", L_ON, DayName[dse%7], d, MonthName[m], y); }
+#define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, %d. %s", DayName[dse%7], d, MonthName[m]); } else { sprintf(s, "%s %s, %d. %s", L_ON, DayName[dse%7], d, MonthName[m]); }
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
 
-#endif /* L_IN_DOSUBST */
-
-#define L_0_OVER sprintf(s, L_HPLU);
-#define L_9_OVER sprintf(s, L_MPLU);
+#define L_0_OVER sprintf(s, L_NPLU(hdiff));
+#define L_9_OVER sprintf(s, L_NPLU(mdiff));
 #define L_1_OVER \
 if (tdiff == 0)  \
 sprintf(s, L_NOW); \
 else if (tdiff > 0) \
 { \
       if (hdiff == 0)  \
-	   sprintf(s, "za %d %s%s", mdiff, L_MINUTE, L_MPLU); \
+	   sprintf(s, "za %d %s%s", mdiff, L_MINUTE, L_NPLU(mdiff)); \
       else if (mdiff == 0) \
-           sprintf(s, "za %d %s%s", hdiff, L_HOUR, L_HPLU); \
+           sprintf(s, "za %d %s%s", hdiff, L_HOUR, L_NPLU(hdiff)); \
       else \
-	   sprintf(s, "za %d %s%s %s %d %s%s", hdiff, L_HOUR, L_HPLU, \
-		   L_AND, mdiff, L_MINUTE, L_MPLU); \
+	   sprintf(s, "za %d %s%s %s %d %s%s", hdiff, L_HOUR, L_NPLU(hdiff), \
+		   L_AND, mdiff, L_MINUTE, L_NPLU(mdiff)); \
 } \
 else \
 { \
    if (hdiff == 0)  \
-      sprintf(s, "%d %s%s temu", mdiff, L_MINUTE, L_MPLU); \
+      sprintf(s, "%d %s%s temu", mdiff, L_MINUTE, L_NPLU(mdiff)); \
    else if (mdiff == 0) \
-      sprintf(s, "%d %s%s temu", hdiff, L_HOUR, L_HPLU); \
+      sprintf(s, "%d %s%s temu", hdiff, L_HOUR, L_NPLU(hdiff)); \
    else \
-      sprintf(s, "%d %s%s %s %d %s%s temu", hdiff, L_HOUR, L_HPLU, \
-	      L_AND, mdiff, L_MINUTE, L_MPLU); \
+      sprintf(s, "%d %s%s %s %d %s%s temu", hdiff, L_HOUR, L_NPLU(hdiff), \
+	      L_AND, mdiff, L_MINUTE, L_NPLU(mdiff)); \
 } 
 
 /* The next ones are used only when MK_GLOBALS is set */
@@ -186,7 +186,7 @@ EXTERN char *ErrMsg[] =
     "Miesiąc podany dwókrotnie",
     "Dzień podany dwókrotnie",
     "Nieznane słowo",
-    "W komendzie OMIT trzeba podać miesiąc i dzień",
+    "W komendzie OMIT trzeba podać miesiąc",
     "Za dużo częściowych komend OMIT",
     "Za dużo pełnych komend OMIT",
     "Ostrzeżenie: PUSH-OMIT-CONTEXT bez POP-OMIT-CONTEXT",
@@ -244,7 +244,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (%s version) Copyright 1992-2023 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
 #endif

src/langs/portbr.h

@@ -8,9 +8,10 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  REMIND is Copyright (C) 1992-2023 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996 by Marco Paganini and      */
 /*  Dianne Skoll.                                              */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -51,9 +52,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "atras"
 #define L_FROMNOW "adiante"
@@ -91,26 +89,26 @@
 #define _ON_WEEKDAY(x) ((x % 7) < 2) ? "no" : "na"
 
 #define L_A_OVER \
-    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m], y);
+    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m], y);
 
 #define L_C_OVER \
-	sprintf(s, "%s %s", _ON_WEEKDAY(jul), DayName[jul%7]);
+	sprintf(s, "%s %s", _ON_WEEKDAY(dse), DayName[dse%7]);
 
 #define L_G_OVER \
-	sprintf(s, "%s %s, %d %s", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m]);
+	sprintf(s, "%s %s, %d %s", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m]);
 
 #define L_J_OVER \
-    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m], y);
+    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m], y);
                     
 #define L_K_OVER \
-    sprintf(s, "%s %s, %d de %s", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m]);
+    sprintf(s, "%s %s, %d de %s", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m]);
 
 /* Portuguese does not use some suffixes, some some %u and %j are the same */
 #define L_U_OVER \
-    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m], y);
+    sprintf(s, "%s %s, %d de %s de %d", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m], y);
 
 #define L_V_OVER \
-    sprintf(s, "%s %s, %d de %s", _ON_WEEKDAY(jul), DayName[jul%7], d, MonthName[m]);
+    sprintf(s, "%s %s, %d de %s", _ON_WEEKDAY(dse), DayName[dse%7], d, MonthName[m]);
 
 #define L_1_OVER \
 { \
@@ -138,8 +136,6 @@
     } \
 }
 
-#endif /* L_IN_DOSUBST */
-
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
 #define L_ERR_OVERRIDE 1
@@ -199,7 +195,7 @@ EXTERN char *ErrMsg[] =
     "Mes especificado duas vezes",
     "Dia especificado duas vezes",
     "Token desconhecido",
-    "Mes e dia devem ser especificados no comando OMIT",
+    "O mes deve ser especificados no comando OMIT",
     "Muitos OMITs parciais",
     "Muitos OMITs full",
     "Aviso: PUSH-OMIT-CONTEXT sem POP-OMIT-CONTEXT correspondente",
@@ -257,7 +253,7 @@ EXTERN char *ErrMsg[] =
 #define L_USAGE_OVERRIDE 1
 void Usage(void)
 {
-    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-2021 Dianne Skoll\n", VERSION, L_LANGNAME);
+    fprintf(ErrFp, "\nREMIND %s (versao %s) (C) 1992-2023 Dianne Skoll\n", VERSION, L_LANGNAME);
 #ifdef BETA
     fprintf(ErrFp, ">>>> VERSAO BETA <<<<\n");
 #endif

src/langs/romanian.h

@@ -8,8 +8,9 @@
 /*                                                             */
 /*  This file is part of REMIND.                               */
 /*                                                             */
-/*  REMIND is Copyright (C) 1992-2021 by Dianne Skoll          */
+/*  REMIND is Copyright (C) 1992-2023 by Dianne Skoll          */
 /*  This file is Copyright (C) 1996-1998 by Liviu Daia         */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -50,9 +51,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-#ifdef L_IN_DOSUBST
-/*** The following are only used in dosubst.c ***/
-
 /* Ago and from now */
 #define L_AGO "acum"
 #define L_FROMNOW "peste"
@@ -76,6 +74,7 @@
 #define L_WAS "a fost"
 /* What to add to make "minute" plural */
 #define L_MPLU "e"
+#define L_HPLU "e"
 
 /* What to add to make "hour" plural */
 #define L_HPLU_OVER hplu = (hdiff == 1 ? "ă" : "e");
@@ -86,14 +85,14 @@
 #define L_AMPM_OVERRIDE(ampm, hour)	ampm = (hour < 12) ? (hour<4) ? " noaptea" : " dimineaţa" : (hour > 17) ? " seara" : " după-amiaza";
 #define L_ORDINAL_OVERRIDE		plu = "";
 
-#define L_A_OVER sprintf(s, "%s, %d %s %d", DayName[jul%7], d, MonthName[m], y);
-#define L_C_OVER sprintf(s, "%s", DayName[jul%7]);
-#define L_G_OVER sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
-#define L_J_OVER sprintf(s, "%s, %s %d, %d", DayName[jul%7], MonthName[m], d, y);
-#define L_K_OVER sprintf(s, "%s, %s %d", DayName[jul%7], MonthName[m], d);
+#define L_A_OVER sprintf(s, "%s, %d %s %d", DayName[dse%7], d, MonthName[m], y);
+#define L_C_OVER sprintf(s, "%s", DayName[dse%7]);
+#define L_G_OVER sprintf(s, "%s, %d %s", DayName[dse%7], d, MonthName[m]);
+#define L_J_OVER sprintf(s, "%s, %s %d, %d", DayName[dse%7], MonthName[m], d, y);
+#define L_K_OVER sprintf(s, "%s, %s %d", DayName[dse%7], MonthName[m], d);
 #define L_S_OVER
-#define L_U_OVER sprintf(s, "%s, %d %s %d", DayName[jul%7], d, MonthName[m], y);
-#define L_V_OVER sprintf(s, "%s, %d %s", DayName[jul%7], d, MonthName[m]);
+#define L_U_OVER sprintf(s, "%s, %d %s %d", DayName[dse%7], d, MonthName[m], y);
+#define L_V_OVER sprintf(s, "%s, %d %s", DayName[dse%7], d, MonthName[m]);
 #define L_1_OVER							\
             if (tdiff == 0)						\
                 sprintf(s, L_NOW);					\
@@ -104,5 +103,3 @@
             else							\
                 sprintf(s, "%s %d %s%s %s %d %s%s", when, hdiff, 	\
 			L_HOUR, hplu, L_AND, mdiff, L_MINUTE, mplu);
-
-#endif /* L_IN_DOSUBST */

src/langs/spanish.h

@@ -7,7 +7,8 @@
 /*  Author: Rafa Couto <rafacouto@biogate.com>                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -47,9 +48,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Hace y desde hoy */
 #define L_AGO "hace"
 #define L_FROMNOW "desde hoy"
@@ -74,5 +72,3 @@
 #define L_HPLU "s"  
 #define L_MPLU "s"
 
-#endif /* L_IN_DOSUBST */
-

src/main.c

@@ -6,12 +6,15 @@
 /*  routines, etc.                                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
+#define _XOPEN_SOURCE 600
 #include "config.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -35,6 +38,10 @@
 #endif
 
 #include <sys/types.h>
+#ifdef REM_USE_WCHAR
+#include <wctype.h>
+#include <wchar.h>
+#endif
 
 #include "types.h"
 #include "protos.h"
@@ -67,6 +74,7 @@ int main(int argc, char *argv[])
     ArgV = (char const **) argv;
 
     InitRemind(argc, (char const **) argv);
+    DBufInit(&(LastTrigger.tags));
     ClearLastTriggers();
 
     if (DoCalendar || (DoSimpleCalendar && (!NextMode || PsCal))) {
@@ -124,7 +132,7 @@ int main(int argc, char *argv[])
 	}
 	if (Iterations) {
 	    PerIterationInit();
-	    JulianToday++;
+	    DSEToday++;
 	}
     }
     return 0;
@@ -169,14 +177,16 @@ static void DoReminders(void)
     Parser p;
     int purge_handled;
 
+    DidMsgReminder = 0;
+
     if (!UseStdin) {
 	FileAccessDate = GetAccessDate(InitialFile);
     } else {
-	FileAccessDate = JulianToday;
+	FileAccessDate = DSEToday;
     }
 
     if (FileAccessDate < 0) {
-	fprintf(ErrFp, "%s: `%s'.\n", ErrMsg[E_CANTACCESS], InitialFile);
+	fprintf(ErrFp, "%s: `%s': %s.\n", ErrMsg[E_CANTACCESS], InitialFile, strerror(errno));
 	exit(1);
     }
 
@@ -253,6 +263,7 @@ static void DoReminders(void)
 	    case T_Flush:   r=DoFlush(&p);   break;
 	    case T_Set:     r=DoSet(&p);     break;
 	    case T_Fset:    r=DoFset(&p);    break;
+	    case T_Funset:  r=DoFunset(&p);  break;
 	    case T_UnSet:   r=DoUnset(&p);   break;
 	    case T_Clr:     r=DoClear(&p);   break;
             case T_Debug:   r=DoDebug(&p);   break;
@@ -307,13 +318,16 @@ static void DoReminders(void)
 
 /***************************************************************/
 /*                                                             */
-/*  Julian                                                     */
+/*  DSE                                                        */
 /*                                                             */
-/*  Given day, month, year, return Julian date in days since   */
+/*  DSE stands for "Days Since Epoch"; the Remind epoch is     */
+/*  midnight on 1990-01-01                                     */
+/*                                                             */
+/*  Given day, month, year, return DSE date in days since      */
 /*  1 January 1990.                                            */
 /*                                                             */
 /***************************************************************/
-int Julian(int year, int month, int day)
+int DSE(int year, int month, int day)
 {
     int y1 = BASE-1, y2 = year-1;
 
@@ -327,14 +341,15 @@ int Julian(int year, int month, int day)
 
 /***************************************************************/
 /*                                                             */
-/*  FromJulian                                                 */
+/*  FromDSE                                                    */
 /*                                                             */
-/*  Convert a Julian date to year, month, day.                 */
+/*  Convert a DSE date to year, month, day.  You may supply    */
+/*  NULL for y, m or d if you're not interested in that value  */
 /*                                                             */
 /***************************************************************/
-void FromJulian(int jul, int *y, int *m, int *d)
+void FromDSE(int dse, int *y, int *m, int *d)
 {
-    int try_yr = (jul / 365) + BASE;
+    int try_yr = (dse / 365) + BASE;
     int try_mon = 0;
     int t;
 
@@ -344,26 +359,49 @@ void FromJulian(int jul, int *y, int *m, int *d)
     int y100 = (y2 / 100) - (y1 / 100); /* Don't count multiples of 100... */
     int y400 = (y2 / 400) - (y1 / 400); /* ... but do count multiples of 400 */
 
-    int try_jul= 365 * (try_yr-BASE) + y4 - y100 + y400;
+    int try_dse= 365 * (try_yr-BASE) + y4 - y100 + y400;
 
-    while (try_jul > jul) {
+    while (try_dse > dse) {
 	try_yr--;
-	try_jul -= DaysInYear(try_yr);
+	try_dse -= DaysInYear(try_yr);
     }
-    jul -= try_jul;
+    dse -= try_dse;
 
     t = DaysInMonth(try_mon, try_yr);
-    while (jul >= t) {
-	jul -= t;
+    while (dse >= t) {
+	dse -= t;
 	try_mon++;
 	t = DaysInMonth(try_mon, try_yr);
     }
-    *y = try_yr;
-    *m = try_mon;
-    *d = jul + 1;
+    if (y) {
+        *y = try_yr;
+    }
+    if (m) {
+        *m = try_mon;
+    }
+    if (d) {
+        *d = dse + 1;
+    }
     return;
 }
 
+int JulianToGregorianOffset(int y, int m)
+{
+    int offset = 13;
+    int centuries;
+    int four_centuries;
+    if (y >= 2100) {
+        centuries = (y - 2000) / 100;
+        four_centuries = (y - 2000) / 400;
+        offset += centuries - four_centuries;
+        if (!(y%100) && (y % 400)) {
+            if (m < 2) {
+                offset--;  /* Offset increments in March */
+            }
+        }
+    }
+    return offset;
+}
 /***************************************************************/
 /*                                                             */
 /*  ParseChar                                                  */
@@ -605,13 +643,23 @@ void Eprint(char const *fmt, ...)
 
     if (FreshLine && FileName) {
 	FreshLine = 0;
-	if (strcmp(FileName, "-"))
+	if (strcmp(FileName, "-")) {
 	    (void) fprintf(ErrFp, "%s(%d): ", FileName, LineNo);
-	else
+            if (print_callstack(ErrFp)) {
+                (void) fprintf(ErrFp, ": ");
+            }
+        } else {
 	    (void) fprintf(ErrFp, "-stdin-(%d): ", LineNo);
+            if (print_callstack(ErrFp)) {
+                (void) fprintf(ErrFp, ": ");
+            }
+        }
 	if (DebugFlag & DB_PRTLINE) OutputLine(ErrFp);
     } else if (FileName) {
 	fprintf(ErrFp, "       ");
+        if (print_callstack(ErrFp)) {
+            (void) fprintf(ErrFp, ": ");
+        }
     }
 
     va_start(argptr, fmt);
@@ -722,7 +770,7 @@ long SystemTime(int realtime)
 /*                                                             */
 /*  SystemDate                                                 */
 /*                                                             */
-/*  Obtains today's date.  Returns Julian date or -1 for       */
+/*  Obtains today's date.  Returns DSE date or -1 for       */
 /*  failure.  (Failure happens if sys date is before BASE      */
 /*  year.)                                                     */
 /*                                                             */
@@ -739,7 +787,7 @@ int SystemDate(int *y, int *m, int *d)
     *m = t->tm_mon;
     *y = t->tm_year + 1900;
 
-    return Julian(*y, *m, *d);
+    return DSE(*y, *m, *d);
 }
 
 
@@ -832,7 +880,7 @@ int DoIfTrig(ParsePtr p)
     unsigned syndrome;
     Trigger trig;
     TimeTrig tim;
-    int jul;
+    int dse;
 
 
     if ((size_t) NumIfs >= IF_NEST) return E_NESTED_IF;
@@ -840,26 +888,26 @@ int DoIfTrig(ParsePtr p)
     else {
 	if ( (r=ParseRem(p, &trig, &tim, 1)) ) return r;
 	if (trig.typ != NO_TYPE) return E_PARSE_ERR;
-	jul = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
+	dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1);
 	if (r) {
             if (r != E_CANT_TRIG || !trig.maybe_uncomputable) {
                 if (!Hush || r != E_RUN_DISABLED) {
                     Eprint("%s", ErrMsg[r]);
                 }
             }
-	    syndrome = IF_TRUE | BEFORE_ELSE;
+	    syndrome = IF_FALSE | BEFORE_ELSE;
 	}
 	else {
-	    if (ShouldTriggerReminder(&trig, &tim, jul, &err)) {
+	    if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
 		syndrome = IF_TRUE | BEFORE_ELSE;
 	    } else {
 		syndrome = IF_FALSE | BEFORE_ELSE;
-		if (PurgeMode) {
-		    PurgeEchoLine("%s\n", "#!P: The next IFTRIG did not trigger.");
-		    PurgeEchoLine("%s\n", "#!P: REM statements in IFTRIG block not checked for purging.");
-		}
 	    }
 	}
+        if (syndrome == (IF_FALSE | BEFORE_ELSE) && PurgeMode) {
+            PurgeEchoLine("%s\n", "#!P: The next IFTRIG did not trigger.");
+            PurgeEchoLine("%s\n", "#!P: REM statements in IFTRIG block not checked for purging.");
+        }
 	FreeTrig(&trig);
     }
     NumIfs++;
@@ -1114,7 +1162,7 @@ int DoErrMsg(ParsePtr p)
     DBufInit(&buf);
     t.typ = MSG_TYPE;
     tt.ttime = SystemTime(0) / 60;
-    if ( (r=DoSubst(p, &buf, &t, &tt, JulianToday, NORMAL_MODE)) ) {
+    if ( (r=DoSubst(p, &buf, &t, &tt, DSEToday, NORMAL_MODE)) ) {
 	return r;
     }
     s = DBufValue(&buf);
@@ -1135,8 +1183,8 @@ int DoErrMsg(ParsePtr p)
 
 /* The array FoldArray[2][7] contains sample years which begin
    on the specified weekday.  For example, FoldArray[0][2] is a
-   non-leapyear beginning on Wednesday, and FoldArray[1][5] is a
-   leapyear beginning on Saturday.  Used to fold back dates which
+   non-leap year beginning on Wednesday, and FoldArray[1][5] is a
+   leap year beginning on Saturday.  Used to fold back dates which
    are too high for the standard Unix representation.
    NOTE:  This implies that you cannot set BASE > 2001!!!!! */
 static int FoldArray[2][7] = {
@@ -1144,28 +1192,30 @@ static int FoldArray[2][7] = {
     {2024, 2008, 2020, 2004, 2016, 2000, 2012}
 };
 
-int CalcMinsFromUTC(int jul, int tim, int *mins, int *isdst)
+int CalcMinsFromUTC(int dse, int tim, int *mins, int *isdst)
 {
 
-/* Convert jul and tim to an Unix tm struct */
+/* Convert dse and tim to an Unix tm struct */
     int yr, mon, day;
     int tdiff;
     struct tm local, utc, *temp;
     time_t loc_t, utc_t;
     int isdst_tmp;
 
-    FromJulian(jul, &yr, &mon, &day);
+    FromDSE(dse, &yr, &mon, &day);
 
 /* If the year is greater than 2037, some Unix machines have problems.
    Fold it back to a "similar" year and trust that the UTC calculations
    are still valid... */
     if (FoldYear && yr>2037) {
-	jul = Julian(yr, 0, 1);
-	yr = FoldArray[IsLeapYear(yr)][jul%7];
+	dse = DSE(yr, 0, 1);
+	yr = FoldArray[IsLeapYear(yr)][dse%7];
     }
     local.tm_sec = 0;
     local.tm_min = tim % 60;
     local.tm_hour = tim / 60;
+
+
     local.tm_mday = day;
     local.tm_mon = mon;
     local.tm_year = yr-1900;
@@ -1194,6 +1244,144 @@ int CalcMinsFromUTC(int jul, int tim, int *mins, int *isdst)
     return 0;
 }
 
+static char const *OutputEscapeSequences(char const *s, int print)
+{
+    while (*s == 0x1B && *(s+1) == '[') {
+        if (print) putchar(*s);
+        s++;
+        if (print) putchar(*s);
+        s++;
+        while (*s && (*s < 0x40 || *s > 0x7E)) {
+            if (print) putchar(*s);
+            s++;
+        }
+        if (*s) {
+            if (print) putchar(*s);
+            s++;
+        }
+    }
+    return s;
+}
+
+#ifdef REM_USE_WCHAR
+#define ISWBLANK(c) (iswspace(c) && (c) != '\n')
+static wchar_t const *OutputEscapeSequencesWS(wchar_t const *s, int print)
+{
+    while (*s == 0x1B && *(s+1) == '[') {
+        if (print) PutWideChar(*s);
+        s++;
+        if (print) PutWideChar(*s);
+        s++;
+        while (*s && (*s < 0x40 || *s > 0x7E)) {
+            if (print) PutWideChar(*s);
+            s++;
+        }
+        if (*s) {
+            if (print) PutWideChar(*s);
+            s++;
+        }
+    }
+    return s;
+}
+
+
+static void
+FillParagraphWCAux(wchar_t const *s)
+{
+    int line = 0;
+    int i, j;
+    int doublespace = 1;
+    int pendspace;
+    int len;
+    wchar_t const *t;
+
+    int roomleft;
+    /* Start formatting */
+    while(1) {
+
+	/* If it's a carriage return, output it and start new paragraph */
+	if (*s == '\n') {
+	    putchar('\n');
+	    s++;
+	    line = 0;
+	    while(ISWBLANK(*s)) s++;
+	    continue;
+	}
+	if (!*s) {
+	    return;
+	}
+	/* Over here, we're at the beginning of a line.  Emit the correct
+	   number of spaces */
+	j = line ? SubsIndent : FirstIndent;
+	for (i=0; i<j; i++) {
+	    putchar(' ');
+	}
+
+	/* Calculate the amount of room left on this line */
+	roomleft = FormWidth - j;
+	pendspace = 0;
+
+	/* Emit words until the next one won't fit */
+	while(1) {
+	    while(ISWBLANK(*s)) s++;
+	    if (*s == '\n') break;
+            while(1) {
+                t = s;
+                s = OutputEscapeSequencesWS(s, 1);
+                if (s == t) break;
+                while(ISWBLANK(*s)) s++;
+            }
+	    t = s;
+            len = 0;
+	    while(*s && !iswspace(*s)) {
+                if (*s == 0x1B && *(s+1) == '[') {
+                    s = OutputEscapeSequencesWS(s, 0);
+                    continue;
+                }
+                len += wcwidth(*s);
+                s++;
+            }
+	    if (s == t) {
+		return;
+	    }
+	    if (!pendspace || len+pendspace <= roomleft) {
+		for (i=0; i<pendspace; i++) {
+		    putchar(' ');
+		}
+		while(t < s) {
+                    PutWideChar(*t);
+		    if (strchr(EndSent, *t)) doublespace = 2;
+		    else if (!strchr(EndSentIg, *t)) doublespace = 1;
+		    t++;
+		}
+	    } else {
+		s = t;
+		putchar('\n');
+		line++;
+		break;
+	    }
+	    roomleft -= len+doublespace;
+	    pendspace = doublespace;
+	}
+    }
+}
+
+static int
+FillParagraphWC(char const *s)
+{
+    size_t len;
+    wchar_t *buf;
+
+    len = mbstowcs(NULL, s, 0);
+    if (len == (size_t) -1) return E_NO_MEM;
+    buf = calloc(len+1, sizeof(wchar_t));
+    if (!buf) return E_NO_MEM;
+    (void) mbstowcs(buf, s, len+1);
+    FillParagraphWCAux(buf);
+    free(buf);
+    return OK;
+}
+#endif
 /***************************************************************/
 /*                                                             */
 /*  FillParagraph                                              */
@@ -1220,11 +1408,17 @@ void FillParagraph(char const *s)
     char const *t;
 
     int roomleft;
-
     if (!s || !*s) return;
 
     /* Skip leading spaces */
     while(ISBLANK(*s)) s++;
+    if (!*s) return;
+
+#ifdef REM_USE_WCHAR
+    if (FillParagraphWC(s) == OK) {
+        return;
+    }
+#endif
 
     /* Start formatting */
     while(1) {
@@ -1255,10 +1449,23 @@ void FillParagraph(char const *s)
 	while(1) {
 	    while(ISBLANK(*s)) s++;
 	    if (*s == '\n') break;
+            while(1) {
+                t = s;
+                s = OutputEscapeSequences(s, 1);
+                if (s == t) break;
+                while(ISBLANK(*s)) s++;
+            }
 	    t = s;
-	    while(*s && !isspace(*s)) s++;
-	    len = s - t;
-	    if (!len) {
+            len = 0;
+	    while(*s && !isspace(*s)) {
+                if (*s == 0x1B && *(s+1) == '[') {
+                    s = OutputEscapeSequences(s, 0);
+                    continue;
+                }
+                s++;
+                len++;
+            }
+	    if (s == t) {
 		return;
 	    }
 	    if (!pendspace || len+pendspace <= roomleft) {
@@ -1347,13 +1554,23 @@ void UTCToLocal(int utcdate, int utctime, int *locdate, int *loctime)
 /* command-line flag is supplied.			       */
 /*							       */
 /***************************************************************/
+static sig_atomic_t got_sigint = 0;
 
-void SigIntHandler(int d)
+void
+SigIntHandler(int d)
 {
     UNUSED(d);
-    signal(SIGINT, SigIntHandler);
-    GotSigInt();
-    exit(0);
+    got_sigint = 1;
+}
+
+int
+GotSigInt(void)
+{
+    if (got_sigint) {
+        got_sigint = 0;
+        return 1;
+    }
+    return 0;
 }
 
 void
@@ -1394,6 +1611,7 @@ ClearLastTriggers(void)
     LastTrigger.warn[0] = 0;
     LastTrigger.omitfunc[0] = 0;
     LastTrigger.passthru[0] = 0;
+    DBufFree(&(LastTrigger.tags));
 
     LastTimeTrig.ttime = NO_TIME;
     LastTimeTrig.delta = NO_DELTA;
@@ -1414,8 +1632,10 @@ SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigt
 void
 SaveLastTrigger(Trigger const *t)
 {
+    DBufFree(&(LastTrigger.tags));
     memcpy(&LastTrigger, t, sizeof(LastTrigger));
     DBufInit(&(LastTrigger.tags));
+    DBufPuts(&(LastTrigger.tags), DBufValue(&(t->tags)));
 }
 
 void
@@ -1431,7 +1651,7 @@ System(char const *cmd)
     int r;
     r = system(cmd);
     if (r == 0) {
-	r = 1;
+        return;
     }
 }
 

src/moon.c

@@ -5,7 +5,8 @@
 /*  Calculations for figuring out moon phases.                 */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -143,7 +144,7 @@ static double phase (double, double *, double *, double *, double *, double *, d
 /*                                                             */
 /*  jdate                                                      */
 /*                                                             */
-/*  Convert a date and time to Julian day and fraction.        */
+/*  Convert a date and time to DSE day and fraction.        */
 /*                                                             */
 /***************************************************************/
 static long jdate(int y, int mon, int day)
@@ -400,9 +401,9 @@ static double phase(double pdate,
 		    double *suangdia)
 {
 
-    double Day, N, M, Ec, Lambdasun, ml, MM, MN, Ev, Ae, A3, MmP,
-	mEc, A4, lP, V, lPP, NP, y, x, Lambdamoon,
-	MoonAge, MoonPhase,
+    double Day, N, M, Ec, Lambdasun, ml, MM, Ev, Ae, A3, MmP,
+	mEc, A4, lP, V, lPP,
+	MoonAge, Phase,
 	MoonDist, MoonDFrac, MoonAng,
 	F, SunDist, SunAng;
 
@@ -431,9 +432,6 @@ static double phase(double pdate,
     /* Moon's mean anomaly */
     MM = fixangle(ml - 0.1114041 * Day - mmlongp);
 
-    /* Moon's ascending node mean longitude */
-    MN = fixangle(mlnode - 0.0529539 * Day);
-
     /* Evection */
     Ev = 1.2739 * sin(torad(2 * (ml - Lambdasun) - MM));
 
@@ -461,26 +459,13 @@ static double phase(double pdate,
     /* 1 longitude */
     lPP = lP + V;
 
-    /* Corrected longitude of the node */
-    NP = MN - 0.16 * sin(torad(M));
-
-    /* Y inclination coordinate */
-    y = sin(torad(lPP - NP)) * cos(torad(minc));
-
-    /* X inclination coordinate */
-    x = cos(torad(lPP - NP));
-
-    /* Ecliptic longitude */
-    Lambdamoon = todeg(atan2(y, x));
-    Lambdamoon += NP;
-
     /* Calculation of the phase of the Moon */
 
     /* Age of the Moon in degrees */
     MoonAge = lPP - Lambdasun;
 
     /* Phase of the Moon */
-    MoonPhase = (1 - cos(torad(MoonAge))) / 2;
+    Phase = (1 - cos(torad(MoonAge))) / 2;
 
     /* Calculate distance of moon from the centre of the Earth */
 
@@ -492,7 +477,7 @@ static double phase(double pdate,
     MoonDFrac = MoonDist / msmax;
     MoonAng = mangsiz / MoonDFrac;
 
-    if(pphase)   *pphase = MoonPhase;
+    if(pphase)   *pphase = Phase;
     if(mage)     *mage = synmonth * (fixangle(MoonAge) / 360.0);
     if(dist)     *dist = MoonDist;
     if(angdia)   *angdia = MoonAng;
@@ -520,10 +505,10 @@ int MoonPhase(int date, int time)
     LocalToUTC(date, time, &utcd, &utct);
 
     /* Convert from Remind representation to year/mon/day */
-    FromJulian(utcd, &y, &m, &d);
+    FromDSE(utcd, &y, &m, &d);
 
-    /* Convert to a true Julian date -- sorry for the name clashes! */
-    jd = jtime(y, m, d, (utct / 60), (utct % 60), 0);   
+    /* Convert to a Julian date */
+    jd = jtime(y, m, d, (utct / 60), (utct % 60), 0);
 
     /* Calculate moon phase */
     mp = 360.0 * phase(jd, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -553,8 +538,8 @@ void HuntPhase(int startdate, int starttim, int phas, int *date, int *time)
     LocalToUTC(startdate, starttim, &utcd, &utct);
 
     /* Convert from Remind representation to year/mon/day */
-    FromJulian(utcd, &y, &m, &d);
-    /* Convert to a true Julian date -- sorry for the name clashes! */
+    FromDSE(utcd, &y, &m, &d);
+    /* Convert to a true Julian date */
     jdorig = jtime(y, m, d, (utct / 60), (utct % 60), 0);   
     jd = jdorig - 45.0;
     nt1 = meanphase(jd, 0.0, &k1);
@@ -572,7 +557,7 @@ void HuntPhase(int startdate, int starttim, int phas, int *date, int *time)
     jyear(jd, &y, &m, &d);
     jhms(jd, &h, &min, &s);
 
-    d1 = Julian(y, m, d);
+    d1 = DSE(y, m, d);
     t1 = h*60 + min;
     UTCToLocal(d1, t1, date, time);
 }

src/omit.c

@@ -6,7 +6,8 @@
 /*  the data structures for OMITted dates.                     */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -28,6 +29,8 @@ static void InsertIntoSortedArray (int *array, int num, int key);
 static int FullOmitArray[MAX_FULL_OMITS];
 static int PartialOmitArray[MAX_PARTIAL_OMITS];
 
+/* WeekdayOmits is declared in global.h */
+
 /* How many of each omit types do we have? */
 static int NumFullOmits, NumPartialOmits;
 
@@ -37,6 +40,7 @@ typedef struct omitcontext {
     int numfull, numpart;
     int *fullsave;
     int *partsave;
+    int weekdaysave;
 } OmitContext;
 
 /* The stack of saved omit contexts */
@@ -52,6 +56,7 @@ static OmitContext *SavedOmitContexts = NULL;
 int ClearGlobalOmits(void)
 {
     NumFullOmits = NumPartialOmits = 0;
+    WeekdayOmits = 0;
     return OK;
 }
 
@@ -113,6 +118,7 @@ int PushOmitContext(ParsePtr p)
 
     context->numfull = NumFullOmits;
     context->numpart = NumPartialOmits;
+    context->weekdaysave = WeekdayOmits;
     context->fullsave = malloc(NumFullOmits * sizeof(int));
     if (NumFullOmits && !context->fullsave) {
 	free(context);
@@ -154,6 +160,7 @@ int PopOmitContext(ParsePtr p)
     if (!c) return E_POP_NO_PUSH;
     NumFullOmits = c->numfull;
     NumPartialOmits = c->numpart;
+    WeekdayOmits = c->weekdaysave;
 
 /* Copy the context over */
     for (i=0; i<NumFullOmits; i++)
@@ -181,7 +188,7 @@ int PopOmitContext(ParsePtr p)
 /*  OK or an error code.                                       */
 /*                                                             */
 /***************************************************************/
-int IsOmitted(int jul, int localomit, char const *omitfunc, int *omit)
+int IsOmitted(int dse, int localomit, char const *omitfunc, int *omit)
 {
     int y, m, d;
 
@@ -193,7 +200,7 @@ int IsOmitted(int jul, int localomit, char const *omitfunc, int *omit)
 	int r;
 	Value v;
 
-	FromJulian(jul, &y, &m, &d);
+	FromDSE(dse, &y, &m, &d);
 	sprintf(expr, "%s('%04d-%02d-%02d')",
 		omitfunc, y, m+1, d);
 	s = expr;
@@ -208,18 +215,24 @@ int IsOmitted(int jul, int localomit, char const *omitfunc, int *omit)
     }
 
     /* Is it omitted because of local omits? */
-    if (localomit & (1 << (jul % 7))) {
+    if (localomit & (1 << (dse % 7))) {
 	*omit = 1;
 	return OK;
     }
 
+    /* Is it omitted because of global weekday omits? */
+    if (WeekdayOmits & (1 << (dse % 7))) {
+        *omit = 1;
+        return OK;
+    }
+
     /* Is it omitted because of fully-specified omits? */
-    if (BexistsIntArray(FullOmitArray, NumFullOmits, jul)) {
+    if (BexistsIntArray(FullOmitArray, NumFullOmits, dse)) {
 	*omit = 1;
 	return OK;
     }
 
-    FromJulian(jul, &y, &m, &d);
+    FromDSE(dse, &y, &m, &d);
     if (BexistsIntArray(PartialOmitArray, NumPartialOmits, (m << 5) + d)) {
 	*omit = 1;
 	return OK;
@@ -271,7 +284,6 @@ static void InsertIntoSortedArray(int *array, int num, int key)
     *cur = key;
 }
 
-static int DoThroughOmit(ParsePtr p, int y, int m, int d);
 static void DumpOmits(void);
 
 /***************************************************************/
@@ -283,11 +295,16 @@ static void DumpOmits(void);
 /***************************************************************/
 int DoOmit(ParsePtr p)
 {
-    int y = NO_YR, m = NO_MON, d = NO_DAY, r;
+    int y[2] = {NO_YR, NO_YR}, m[2] = {NO_MON, NO_MON}, d[2] = {NO_DAY, NO_DAY}, r;
     Token tok;
-    int parsing=1;
+    int parsing = 1;
+    int seen_through = 0;
     int syndrome;
     int not_first_token = -1;
+    int start, end, tmp;
+    int wd = 0;
+
+    int mc, dc;
 
     DynamicBuffer buf;
     DBufInit(&buf);
@@ -298,9 +315,15 @@ int DoOmit(ParsePtr p)
 	if ( (r=ParseToken(p, &buf)) ) return r;
 	FindToken(DBufValue(&buf), &tok);
 	switch (tok.type) {
-	case T_Dumpvars:
-	    if (not_first_token) return E_PARSE_ERR;
+        case T_WkDay:
 	    DBufFree(&buf);
+            if (wd & (1 << tok.val)) return E_WD_TWICE;
+            wd |= (1 << tok.val);
+            break;
+
+	case T_Dumpvars:
+	    DBufFree(&buf);
+	    if (not_first_token) return E_PARSE_ERR;
 	    r = VerifyEoln(p);
 	    if (r != OK) return r;
 	    DumpOmits();
@@ -308,28 +331,28 @@ int DoOmit(ParsePtr p)
 
 	case T_Date:
 	    DBufFree(&buf);
-	    if (y != NO_YR) return E_YR_TWICE;
-	    if (m != NO_MON) return E_MON_TWICE;
-	    if (d != NO_DAY) return E_DAY_TWICE;
-	    FromJulian(tok.val, &y, &m, &d);
+	    if (y[seen_through] != NO_YR) return E_YR_TWICE;
+	    if (m[seen_through] != NO_MON) return E_MON_TWICE;
+	    if (d[seen_through] != NO_DAY) return E_DAY_TWICE;
+	    FromDSE(tok.val, &y[seen_through], &m[seen_through], &d[seen_through]);
 	    break;
 
 	case T_Year:
 	    DBufFree(&buf);
-	    if (y != NO_YR) return E_YR_TWICE;
-	    y = tok.val;
+	    if (y[seen_through] != NO_YR) return E_YR_TWICE;
+	    y[seen_through] = tok.val;
 	    break;
 
 	case T_Month:
 	    DBufFree(&buf);
-	    if (m != NO_MON) return E_MON_TWICE;
-	    m = tok.val;
+	    if (m[seen_through] != NO_MON) return E_MON_TWICE;
+	    m[seen_through] = tok.val;
 	    break;
 
 	case T_Day:
 	    DBufFree(&buf);
-	    if (d != NO_DAY) return E_DAY_TWICE;
-	    d = tok.val;
+	    if (d[seen_through] != NO_DAY) return E_DAY_TWICE;
+	    d[seen_through] = tok.val;
 	    break;
 
 	case T_Delta:
@@ -338,8 +361,10 @@ int DoOmit(ParsePtr p)
 
 	case T_Through:
 	    DBufFree(&buf);
-	    if (y == NO_YR || m == NO_MON || d == NO_DAY) return E_INCOMPLETE;
-	    return DoThroughOmit(p, y, m, d);
+            if (wd) return E_PARSE_ERR;
+            if (seen_through) return E_UNTIL_TWICE;
+            seen_through = 1;
+            break;
 
 	case T_Empty:
 	case T_Comment:
@@ -358,131 +383,113 @@ int DoOmit(ParsePtr p)
 	    return E_UNKNOWN_TOKEN;
 	}
     }
-    if (m == NO_MON || d == NO_DAY) return E_SPEC_MON_DAY;
 
-    if (y == NO_YR) {
-	if (NumPartialOmits == MAX_PARTIAL_OMITS) return E_2MANY_PART;
+    if (wd) {
+        if (y[0] != NO_YR || m[0] != NO_MON || d[0] != NO_DAY) {
+            return E_PARSE_ERR;
+        }
+        if ((WeekdayOmits | wd) == 0x7F) {
+            return E_2MANY_LOCALOMIT;
+        }
+        WeekdayOmits |= wd;
+        if (tok.type == T_Tag || tok.type == T_Duration || tok.type == T_RemType || tok.type == T_Priority) return E_PARSE_AS_REM;
+        return OK;
+    }
 
-	if (d > MonthDays[m]) return E_BAD_DATE;
-	syndrome = (m<<5) + d;
-	if (!BexistsIntArray(PartialOmitArray, NumPartialOmits, syndrome)) {
-	    InsertIntoSortedArray(PartialOmitArray, NumPartialOmits, syndrome);
-	    NumPartialOmits++;
-	}
+    if (!seen_through) {
+        /* We must have at least a month */
+        if (m[0] == NO_MON) return E_SPEC_MON;
+        m[1] = m[0];
+        y[1] = y[0];
+        if (d[0] == NO_DAY) {
+            d[0] = 1;
+            if (y[0] == NO_YR) {
+                d[1] = MonthDays[m[0]];
+            } else {
+                d[1] = DaysInMonth(m[0], y[0]);
+            }
+        } else {
+            d[1] = d[0];
+            m[1] = m[0];
+            y[1] = y[0];
+        }
     } else {
-
-	if (d > DaysInMonth(m, y)) return E_BAD_DATE;
-	syndrome = Julian(y, m, d);
-        r = AddGlobalOmit(syndrome);
-        if (r) {
-            return r;
+        if (m[0] == NO_MON) return E_SPEC_MON;
+        if (m[1] == NO_MON) return E_SPEC_MON;
+        if ((y[0] != NO_YR && y[1] == NO_YR) ||
+            (y[0] == NO_YR && y[1] != NO_YR)) {
+            return E_BAD_DATE;
+        }
+        if (d[0] == NO_DAY) d[0] = 1;
+        if (d[1] == NO_DAY) {
+            if (y[1] == NO_YR) {
+                d[1] = MonthDays[m[1]];
+            } else {
+                d[1] = DaysInMonth(m[1], y[1]);
+            }
         }
     }
+
+    if (y[0] == NO_YR) {
+        /* Partial OMITs */
+	if (d[0] > MonthDays[m[0]]) return E_BAD_DATE;
+	if (d[1] > MonthDays[m[1]]) return E_BAD_DATE;
+        dc = d[0];
+        mc = m[0];
+        while(1) {
+            syndrome = (mc<<5) + dc;
+            if (!BexistsIntArray(PartialOmitArray, NumPartialOmits, syndrome)) {
+                InsertIntoSortedArray(PartialOmitArray, NumPartialOmits, syndrome);
+                NumPartialOmits++;
+            }
+            if (mc == m[1] && dc == d[1]) {
+                break;
+            }
+            dc++;
+            if (dc > MonthDays[mc]) {
+                dc = 1;
+                mc++;
+                if (mc > 11) {
+                    mc = 0;
+                }
+            }
+        }
+    } else {
+        /* Full OMITs */
+	if (d[0] > DaysInMonth(m[0], y[0])) return E_BAD_DATE;
+	if (d[1] > DaysInMonth(m[1], y[1])) return E_BAD_DATE;
+        start = DSE(y[0], m[0], d[0]);
+        end   = DSE(y[1], m[1], d[1]);
+        if (end < start) {
+            Eprint("Error: THROUGH date earlier than start date");
+            return E_BAD_DATE;
+        }
+
+        for (tmp = start; tmp <= end; tmp++) {
+            if (!BexistsIntArray(FullOmitArray, NumFullOmits, tmp)) {
+                if (NumFullOmits >= MAX_FULL_OMITS) return E_2MANY_FULL;
+                InsertIntoSortedArray(FullOmitArray, NumFullOmits, tmp);
+                NumFullOmits++;
+            }
+        }
+    }
+
     if (tok.type == T_Tag || tok.type == T_Duration || tok.type == T_RemType || tok.type == T_Priority) return E_PARSE_AS_REM;
     return OK;
 
 }
 
 int
-AddGlobalOmit(int jul)
+AddGlobalOmit(int dse)
 {
     if (NumFullOmits == MAX_FULL_OMITS) return E_2MANY_FULL;
-    if (!BexistsIntArray(FullOmitArray, NumFullOmits, jul)) {
-        InsertIntoSortedArray(FullOmitArray, NumFullOmits, jul);
+    if (!BexistsIntArray(FullOmitArray, NumFullOmits, dse)) {
+        InsertIntoSortedArray(FullOmitArray, NumFullOmits, dse);
         NumFullOmits++;
     }
     return OK;
 }
 
-static int
-DoThroughOmit(ParsePtr p, int ystart, int mstart, int dstart)
-{
-    int yend = NO_YR, mend = NO_MON, dend = NO_DAY, r;
-    int start, end, tmp;
-    int parsing = 1;
-
-    Token tok;
-
-    DynamicBuffer buf;
-    DBufInit(&buf);
-
-    while(parsing) {
-	if ( (r=ParseToken(p, &buf)) ) return r;
-	FindToken(DBufValue(&buf), &tok);
-
-	switch(tok.type) {
-	case T_Date:
-	    DBufFree(&buf);
-	    if (yend != NO_YR) return E_YR_TWICE;
-	    if (mend != NO_MON) return E_MON_TWICE;
-	    if (dend != NO_DAY) return E_DAY_TWICE;
-	    FromJulian(tok.val, &yend, &mend, &dend);
-	    break;
-
-	case T_Year:
-	    DBufFree(&buf);
-	    if (yend != NO_YR) return E_YR_TWICE;
-	    yend = tok.val;
-	    break;
-
-	case T_Month:
-	    DBufFree(&buf);
-	    if (mend != NO_MON) return E_MON_TWICE;
-	    mend = tok.val;
-	    break;
-
-	case T_Day:
-	    DBufFree(&buf);
-	    if (dend != NO_DAY) return E_DAY_TWICE;
-	    dend = tok.val;
-	    break;
-
-	case T_Empty:
-	case T_Comment:
-	case T_RemType:
-	case T_Priority:
-	case T_Tag:
-	case T_Duration:
-	    DBufFree(&buf);
-	    parsing = 0;
-	    break;
-
-	default:
-	    Eprint("%s: `%s' (OMIT)", ErrMsg[E_UNKNOWN_TOKEN],
-		   DBufValue(&buf));
-	    DBufFree(&buf);
-	    return E_UNKNOWN_TOKEN;
-
-	}
-    }
-    if (yend == NO_YR || mend == NO_MON || dend == NO_DAY) return E_INCOMPLETE;
-    if (dend > DaysInMonth(mend, yend)) return E_BAD_DATE;
-    if (dstart > DaysInMonth(mstart, ystart)) return E_BAD_DATE;
-
-    start = Julian(ystart, mstart, dstart);
-    end   = Julian(yend,   mend,   dend);
-
-    if (end < start) {
-	Wprint("Warning: Swapping dates on OMIT ... THROUGH ... line");
-	tmp = start;
-	start = end;
-	end = tmp;
-    }
-
-    tmp = end - start + 1;
-
-    /* Don't create any OMITs if there would be too many. */
-    if (NumFullOmits + tmp >= MAX_FULL_OMITS) return E_2MANY_FULL;
-    for (tmp = start; tmp <= end; tmp++) {
-	if (!BexistsIntArray(FullOmitArray, NumFullOmits, tmp)) {
-	    InsertIntoSortedArray(FullOmitArray, NumFullOmits, tmp);
-	    NumFullOmits++;
-	}
-    }
-    if (tok.type == T_Tag || tok.type == T_Duration || tok.type == T_RemType || tok.type == T_Priority) return E_PARSE_AS_REM;
-    return OK;
-}
-
 void
 DumpOmits(void)
 {
@@ -493,7 +500,7 @@ DumpOmits(void)
 	printf("\tNone.\n");
     } else {
 	for (i=0; i<NumFullOmits; i++) {
-	    FromJulian(FullOmitArray[i], &y, &m, &d);
+	    FromDSE(FullOmitArray[i], &y, &m, &d);
 	    printf("\t%04d%c%02d%c%02d\n",
 		    y, DateSep, m+1, DateSep, d);
 	}
@@ -508,5 +515,15 @@ DumpOmits(void)
 	    printf("\t%02d%c%02d\n", m+1, DateSep, d);
 	}
     }
+    printf("Global Weekday OMITs:\n");
+    if (WeekdayOmits == 0) {
+        printf("\tNone.\n");
+    } else {
+        for (i=0; i<7; i++) {
+            if (WeekdayOmits & (1<<i)) {
+                printf("\t%s\n", EnglishDayName[i]);
+            }
+        }
+    }
 }
 

src/protos.h

@@ -5,7 +5,8 @@
 /*  Function Prototypes.                                       */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -22,9 +23,11 @@
 #define isempty(c) (isspace(c) || ((c) == '\\'))
 
 #include "dynbuf.h"
+#include <ctype.h>
 
 int CallUserFunc (char const *name, int nargs, ParsePtr p);
 int DoFset (ParsePtr p);
+int DoFunset (ParsePtr p);
 void ProduceCalendar (void);
 char const *SimpleTime (int tim);
 char const *CalendarTime (int tim, int duration);
@@ -32,11 +35,11 @@ int DoRem (ParsePtr p);
 int DoFlush (ParsePtr p);
 void DoExit (ParsePtr p);
 int ParseRem (ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals);
-int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int jul);
-int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int jul, int *err);
-int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul, int mode);
-int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int jul, int tim);
-int ParseLiteralDate (char const **s, int *jul, int *tim);
+int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int dse);
+int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int dse, int *err);
+int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode);
+int DoSubstFromString (char const *source, DynamicBuffer *dbuf, int dse, int tim);
+int ParseLiteralDate (char const **s, int *dse, int *tim);
 int ParseLiteralTime (char const **s, int *tim);
 int EvalExpr (char const **e, Value *v, ParsePtr p);
 int DoCoerce (char type, Value *v);
@@ -48,13 +51,14 @@ int DoInclude (ParsePtr p, enum TokTypes tok);
 int DoIncludeCmd (ParsePtr p);
 int IncludeFile (char const *fname);
 int GetAccessDate (char const *file);
-int SetAccessDate (char const *fname, int jul);
+int SetAccessDate (char const *fname, int dse);
 int TopLevel (void);
 int CallFunc (BuiltinFunc *f, int nargs);
 void InitRemind (int argc, char const *argv[]);
 void Usage (void);
-int Julian (int year, int month, int day);
-void FromJulian (int jul, int *y, int *m, int *d);
+int DSE (int year, int month, int day);
+void FromDSE (int dse, int *y, int *m, int *d);
+int JulianToGregorianOffset(int y, int m);
 int ParseChar (ParsePtr p, int *err, int peek);
 int ParseToken (ParsePtr p, DynamicBuffer *dbuf);
 int ParseIdentifier (ParsePtr p, DynamicBuffer *dbuf);
@@ -84,7 +88,7 @@ int DoClear (ParsePtr p);
 int DestroyOmitContexts (void);
 int PushOmitContext (ParsePtr p);
 int PopOmitContext (ParsePtr p);
-int IsOmitted (int jul, int localomit, char const *omitfunc, int *omit);
+int IsOmitted (int dse, int localomit, char const *omitfunc, int *omit);
 int DoOmit (ParsePtr p);
 int QueueReminder (ParsePtr p, Trigger *trig, TimeTrig *tim, char const *sched);
 void HandleQueuedReminders (void);
@@ -94,9 +98,7 @@ void FindNumericToken (char const *s, Token *t);
 int ComputeTrigger (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals);
 int ComputeTriggerNoAdjustDuration (int today, Trigger *trig, TimeTrig *tim, int *err, int save_in_globals, int duration_days);
 int AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int save_in_globals);
-int ComputeScanStart(int today, Trigger *trig, TimeTrig *tt);
 char *StrnCpy (char *dest, char const *source, int n);
-int StrMatch (char const *s1, char const *s2, int n);
 int StrinCmp (char const *s1, char const *s2, int n);
 char *StrDup (char const *s);
 int StrCmpi (char const *s1, char const *s2);
@@ -118,24 +120,24 @@ unsigned int HashVal (char const *str);
 int DateOK (int y, int m, int d);
 Operator *FindOperator (char const *name, Operator where[], int num);
 BuiltinFunc *FindFunc (char const *name, BuiltinFunc where[], int num);
-int InsertIntoSortBuffer (int jul, int tim, char const *body, int typ, int prio);
+int InsertIntoSortBuffer (int dse, int tim, char const *body, int typ, int prio);
 void IssueSortedReminders (void);
 int UserFuncExists (char const *fn);
-void JulToHeb (int jul, int *hy, int *hm, int *hd);
+void DSEToHeb (int dse, int *hy, int *hm, int *hd);
 int HebNameToNum (char const *mname);
 char const *HebMonthName (int m, int y);
 int RoshHashana (int i);
 long DaysToHebYear (int y);
 int DaysInHebYear (int y);
 char const *DaysInHebMonths (int ylen);
-int HebToJul (int hy, int hm, int hd);
+int HebToDSE (int hy, int hm, int hd);
 int GetValidHebDate (int yin, int min, int din, int adarbehave, int *mout, int *dout, int yahr);
-int GetNextHebrewDate (int julstart, int hm, int hd, int yahr, int adarbehave, int *ans);
+int GetNextHebrewDate (int dsestart, int hm, int hd, int yahr, int adarbehave, int *ans);
 int ComputeJahr (int y, int m, int d, int *ans);
 int GetSysVar (char const *name, Value *val);
 int SetSysVar (char const *name, Value *val);
 void DumpSysVarByName (char const *name);
-int CalcMinsFromUTC (int jul, int tim, int *mins, int *isdst);
+int CalcMinsFromUTC (int dse, int tim, int *mins, int *isdst);
 void FillParagraph (char const *s);
 void LocalToUTC (int locdate, int loctime, int *utcdate, int *utctime);
 void UTCToLocal (int utcdate, int utctime, int *locdate, int *loctime);
@@ -143,7 +145,7 @@ int MoonPhase (int date, int time);
 void HuntPhase (int startdate, int starttim, int phas, int *date, int *time);
 int CompareRems (int dat1, int tim1, int prio1, int dat2, int tim2, int prio2, int bydate, int bytime, int byprio, int untimed_first);
 void SigIntHandler (int d);
-void GotSigInt (void);
+int GotSigInt (void);
 void PurgeEchoLine(char const *fmt, ...);
 void FreeTrig(Trigger *t);
 void AppendTag(DynamicBuffer *buf, char const *s);
@@ -154,19 +156,30 @@ void SaveLastTimeTrig(TimeTrig const *t);
 void SaveAllTriggerInfo(Trigger const *t, TimeTrig const *tt, int trigdate, int trigtime, int valid);
 
 void PerIterationInit(void);
-char const *Decolorize(int r, int g, int b);
-char const *Colorize(int r, int g, int b);
+char const *Decolorize(void);
+char const *Colorize(int r, int g, int b, int bg, int clamp);
 void PrintJSONString(char const *s);
 void PrintJSONKeyPairInt(char const *name, int val);
 void PrintJSONKeyPairString(char const *name, char const *val);
-void PrintJSONKeyPairDate(char const *name, int jul);
+void PrintJSONKeyPairDate(char const *name, int dse);
 void PrintJSONKeyPairDateTime(char const *name, int dt);
 void PrintJSONKeyPairTime(char const *name, int t);
 void System(char const *cmd);
 int ShellEscape(char const *in, DynamicBuffer *out);
-int AddGlobalOmit(int jul);
+int AddGlobalOmit(int dse);
 void set_lat_and_long_from_components(void);
 void set_components_from_lat_and_long(void);
 
 char const *get_day_name(int wkday);
 char const *get_month_name(int mon);
+
+int push_call(char const *filename, char const *func, int lineno);
+void clear_callstack(void);
+int print_callstack(FILE *fp);
+void pop_call(void);
+#ifdef REM_USE_WCHAR
+#define _XOPEN_SOURCE 600
+#include <wctype.h>
+#include <wchar.h>
+void PutWideChar(wchar_t const wc);
+#endif

src/queue.c

@@ -5,7 +5,8 @@
 /*  Queue up reminders for subsequent execution.               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -59,6 +60,7 @@ static QueuedRem *FindNextReminder (void);
 static int CalculateNextTimeUsingSched (QueuedRem *q);
 static void DaemonWait (struct timeval *sleep_tv);
 static void reread (void);
+static void PrintQueue(void);
 
 /***************************************************************/
 /*                                                             */
@@ -74,6 +76,7 @@ int QueueReminder(ParsePtr p, Trigger *trig,
     QueuedRem *qelem;
 
     if (DontQueue ||
+        trig->noqueue ||
 	tim->ttime == NO_TIME ||
 	trig->typ == CAL_TYPE ||
 	tim->ttime < SystemTime(0) / 60 ||
@@ -123,9 +126,10 @@ void HandleQueuedReminders(void)
     Trigger trig;
     struct timeval tv;
     struct timeval sleep_tv;
+    struct sigaction sa;
 
     /* Suppress the BANNER from being issued */
-    NumTriggered = 1;
+    DidMsgReminder = 1;
 
     /* Turn off sorting -- otherwise, TriggerReminder has no effect! */
     SortByDate = 0;
@@ -161,7 +165,11 @@ void HandleQueuedReminders(void)
 	q = q->next;
     }
 
-    if (!DontFork || Daemon) signal(SIGINT, SigIntHandler);
+    if (!DontFork || Daemon) {
+        sa.sa_handler = SigIntHandler;
+        sa.sa_flags = 0;
+        (void) sigaction(SIGINT, &sa, NULL);
+    }
 
     /* Sit in a loop, issuing reminders when necessary */
     while(1) {
@@ -184,7 +192,9 @@ void HandleQueuedReminders(void)
 	while (TimeToSleep > 0L) {
 	    SleepTime = TimeToSleep;
 
-	    if (Daemon > 0 && SleepTime > (unsigned int) 60*Daemon) SleepTime = 60*Daemon;
+	    if (Daemon > 0 && SleepTime > (unsigned int) 60*Daemon) {
+                SleepTime = 60*Daemon;
+            }
 
 	    /* Wake up once a minute to recalibrate sleep time in
 	       case of laptop hibernation */
@@ -203,6 +213,10 @@ void HandleQueuedReminders(void)
 		sleep(SleepTime);
             }
 
+            if (GotSigInt()) {
+                PrintQueue();
+            }
+
 	    /* If not in daemon mode and day has rolled around,
 	       exit -- not much we can do. */
 	    if (!Daemon) {
@@ -230,7 +244,7 @@ void HandleQueuedReminders(void)
 	/* Do NOT trigger the reminder if tt.nexttime is more than a
 	   minute in the past.  This can happen if the clock is
 	   changed or a laptop awakes from hibernation.
-	   However, DO triger if tt.nexttime == tt.ttime so all
+	   However, DO trigger if tt.nexttime == tt.ttime so all
 	   queued reminders are triggered at least once. */
 	if ((SystemTime(1) - (q->tt.nexttime * 60) <= 60) ||
 	    (q->tt.nexttime == q->tt.ttime)) {
@@ -252,8 +266,8 @@ void HandleQueuedReminders(void)
 
 	    /* Set up global variables so some functions like trigdate()
 	       and trigtime() work correctly                             */
-	    SaveAllTriggerInfo(&(q->t), &(q->tt), JulianToday, q->tt.ttime, 1);
-	    (void) TriggerReminder(&p, &trig, &q->tt, JulianToday);
+	    SaveAllTriggerInfo(&(q->t), &(q->tt), DSEToday, q->tt.ttime, 1);
+	    (void) TriggerReminder(&p, &trig, &q->tt, DSEToday);
 	    if (Daemon < 0) {
 		printf("NOTE endreminder\n");
 	    }
@@ -335,13 +349,13 @@ static QueuedRem *FindNextReminder(void)
 
 /***************************************************************/
 /*                                                             */
-/* GotSigInt						       */
+/* PrintQueue						       */
 /*                                                             */
-/* Split out what's done on a SIGINT from the SIGINT Handler.  */
-/* This will be necessary for OS/2 multithreaded.	       */
+/* For debugging: Print queue contents to STDOUT               */
 /*                                                             */
 /***************************************************************/
-void GotSigInt(void)
+static
+void PrintQueue(void)
 {
     QueuedRem *q = QueueHead;
 
@@ -366,6 +380,7 @@ void GotSigInt(void)
 	q = q->next;
     }
     printf(NL);
+    printf("To terminate program, send SIGQUIT (probably Ctrl-\\ on the keyboard.)%s", NL);
 }
 
 /***************************************************************/

src/rem2ps.c

@@ -5,7 +5,8 @@
 /*  Print a PostScript calendar.                               */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -349,7 +350,7 @@ int main(int argc, char *argv[])
 	    !strcmp(DBufValue(&buf), PSBEGIN2)) {
 	    if (!validfile) {
 		if (Verbose) {
-		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-2021 by Dianne Skoll\n\n", VERSION);
+		    fprintf(stderr, "Rem2PS: Version %s Copyright 1992-2023 by Dianne Skoll\n\n", VERSION);
 		    fprintf(stderr, "Generating PostScript calendar\n");
 		}
 	    }
@@ -389,7 +390,7 @@ void DoPsCal(void)
    month */
     DBufInit(&buf);
     DBufGets(&buf, stdin);
-    sscanf(DBufValue(&buf), "%s %s %d %d %d", month, year, &days, &wkday,
+    sscanf(DBufValue(&buf), "%39s %39s %d %d %d", month, year, &days, &wkday,
 	   &MondayFirst);
 
     /* Replace underscores in month name with spaces */
@@ -421,9 +422,9 @@ void DoPsCal(void)
     }
 
     DBufGets(&buf, stdin);
-    sscanf(DBufValue(&buf), "%s %d", prevm, &prevdays);
+    sscanf(DBufValue(&buf), "%39s %d", prevm, &prevdays);
     DBufGets(&buf, stdin);
-    sscanf(DBufValue(&buf), "%s %d", nextm, &nextdays);
+    sscanf(DBufValue(&buf), "%39s %d", nextm, &nextdays);
 
     /* Replace underscores with spaces in names of next/prev month */
     s = prevm;

src/rem2ps.h

@@ -5,7 +5,8 @@
 /*  Define the PostScript prologue                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -13,7 +14,7 @@ char *PSProlog1[] =
 {
     "% This file was produced by Remind and Rem2PS, written by",
     "% Dianne Skoll.",
-    "% Remind and Rem2PS are Copyright 1992-2021 Dianne Skoll.",
+    "% Remind and Rem2PS are Copyright 1992-2023 Dianne Skoll.",
     "/ISOLatin1Encoding where { pop save true }{ false } ifelse",
     "  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus",
     "    StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute",

src/sort.c

@@ -5,7 +5,8 @@
 /*  Routines for sorting reminders by trigger date             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -34,8 +35,8 @@ typedef struct sortrem {
 /* The sorted reminder queue */
 static Sortrem *SortedQueue = (Sortrem *) NULL;
 
-static Sortrem *MakeSortRem (int jul, int tim, char const *body, int typ, int prio);
-static void IssueSortBanner (int jul);
+static Sortrem *MakeSortRem (int dse, int tim, char const *body, int typ, int prio);
+static void IssueSortBanner (int dse);
 
 /***************************************************************/
 /*                                                             */
@@ -44,7 +45,7 @@ static void IssueSortBanner (int jul);
 /*  Create a new Sortrem entry - return NULL on failure.       */
 /*                                                             */
 /***************************************************************/
-static Sortrem *MakeSortRem(int jul, int tim, char const *body, int typ, int prio)
+static Sortrem *MakeSortRem(int dse, int tim, char const *body, int typ, int prio)
 {
     Sortrem *new = NEW(Sortrem);
     if (!new) return NULL;
@@ -55,7 +56,7 @@ static Sortrem *MakeSortRem(int jul, int tim, char const *body, int typ, int pri
 	return NULL;
     }
   
-    new->trigdate = jul;
+    new->trigdate = dse;
     new->trigtime = tim;
     new->typ = typ;
     new->priority = prio;
@@ -70,9 +71,9 @@ static Sortrem *MakeSortRem(int jul, int tim, char const *body, int typ, int pri
 /*  Insert a reminder into the sort buffer                     */
 /*                                                             */
 /***************************************************************/
-int InsertIntoSortBuffer(int jul, int tim, char const *body, int typ, int prio)
+int InsertIntoSortBuffer(int dse, int tim, char const *body, int typ, int prio)
 {
-    Sortrem *new = MakeSortRem(jul, tim, body, typ, prio);
+    Sortrem *new = MakeSortRem(dse, tim, body, typ, prio);
     Sortrem *cur = SortedQueue, *prev = NULL;
     int ShouldGoAfter;
 
@@ -146,6 +147,10 @@ void IssueSortedReminders(void)
 	    break;
 
 	case MSF_TYPE:
+            if (cur->trigdate != olddate) {
+                IssueSortBanner(cur->trigdate);
+                olddate = cur->trigdate;
+            }
 	    FillParagraph(cur->text);
 	    break;
 
@@ -168,7 +173,7 @@ void IssueSortedReminders(void)
 /*  defined to take one argument.                              */
 /*                                                             */
 /***************************************************************/
-static void IssueSortBanner(int jul)
+static void IssueSortBanner(int dse)
 {
     char BanExpr[64];
     int y, m, d;
@@ -178,13 +183,13 @@ static void IssueSortBanner(int jul)
 
     if (UserFuncExists("sortbanner") != 1) return;
 
-    FromJulian(jul, &y, &m, &d);
+    FromDSE(dse, &y, &m, &d);
     sprintf(BanExpr, "sortbanner('%04d/%02d/%02d')", y, m+1, d);   
     y = EvalExpr(&s, &v, NULL);
     if (y) return;
     if (DoCoerce(STR_TYPE, &v)) return;
     DBufInit(&buf);
-    if (!DoSubstFromString(v.v.str, &buf, jul, NO_TIME)) {
+    if (!DoSubstFromString(v.v.str, &buf, dse, NO_TIME)) {
 	if (*DBufValue(&buf)) printf("%s\n", DBufValue(&buf));
 	DBufFree(&buf);
     }

src/test-all-languages.sh

@@ -4,9 +4,23 @@
 
 ALL=`grep ^#define lang.h | grep -v '#define LANG' | awk '{print $2}'`
 
+OUTPUT_COMPILED=lang-compiled.out
+OUTPUT_RUNTIME=lang-runtime.out
+cat /dev/null > $OUTPUT_COMPILED
+cat /dev/null > $OUTPUT_RUNTIME
 for i in $ALL ; do
     make clean
     make -j`nproc` all LANGDEF=-DLANG=$i || exit 1
-    ./remind -q -r ../tests/tstlang.rem
+    ./remind -q -r ../tests/tstlang.rem >> $OUTPUT_COMPILED 2>&1
 done
+
+# Rebuild English version
+make clean
+make -j`nproc` all || exit 1
+
+ALL=`ls ../include/lang/*.rem`
+for i in $ALL; do
+    ./remind -q -r "-ii=\"$i\"" ../tests/tstlang.rem >> $OUTPUT_RUNTIME 2>&1
+done
+
 exit 0

src/token.c

@@ -6,7 +6,8 @@
 /*  classifying the tokens parsed.                             */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -62,6 +63,7 @@ Token TokArray[] = {
     { "friday",		3,	T_WkDay,	4 },
     { "from",		4,	T_Scanfrom,	FROM_TYPE },
     { "fset",		4,	T_Fset,		0 },
+    { "funset",         6,      T_Funset,       0 },
     { "if",		2,	T_If,		0 },
     { "iftrig",		6,	T_IfTrig,	0 },
     { "in",             2,      T_In,           0 },
@@ -79,6 +81,7 @@ Token TokArray[] = {
     { "monday",		3,	T_WkDay,	0 },
     { "msf",		3,	T_RemType,	MSF_TYPE },
     { "msg",		3,	T_RemType,	MSG_TYPE },
+    { "noqueue",        7,      T_NoQueue,      0 },
     { "november",	3,	T_Month,	10 },
     { "october",	3,	T_Month,	9 },
     { "omit",		3,	T_Omit,		0 },
@@ -155,10 +158,6 @@ void FindToken(char const *s, Token *tok)
     int top, bot, mid, r, max;
     int l;
 
-#if LANG != ENGLISH
-    size_t i;
-#endif
-
     tok->type = T_Illegal;
     if (! *s) {
 	tok->type = T_Empty;
@@ -242,16 +241,16 @@ void FindNumericToken(char const *s, Token *t)
 	/* If we hit a '-' or a '/', we may have a date or a datetime */
 	if (*s == '-' || *s == '/') {
 	    char const *p = s_orig;
-	    int jul, tim;
-	    if (ParseLiteralDate(&p, &jul, &tim) == OK) {
+	    int dse, tim;
+	    if (ParseLiteralDate(&p, &dse, &tim) == OK) {
 		if (*p) return;
 		if (tim == NO_TIME) {
 		    t->type = T_Date;
-		    t->val = jul;
+		    t->val = dse;
 		    return;
 		}
 		t->type = T_DateTime;
-		t->val = MINUTES_PER_DAY * jul + tim;
+		t->val = MINUTES_PER_DAY * dse + tim;
 	    }
 	    return;
 	}
@@ -259,7 +258,6 @@ void FindNumericToken(char const *s, Token *t)
 	/* If we hit a comma, swallow it.  This allows stuff
 	   like Jan 6, 1998 */
 	if (*s == ',') {
-	    s++;
 	    /* Classify the number we've got */
 	    if (t->val >= BASE && t->val <= BASE+YR_RANGE) t->type = T_Year;
 	    else if (t->val >= 1 && t->val <= 31) t->type = T_Day;
@@ -358,7 +356,8 @@ static int TokStrCmp(Token const *t, char const *s)
     register int r;
     char const *tk = t->name;
     while(*tk && *s && !(*s == ',' && *(s+1) == 0)) {
-	r = tolower(*tk) - tolower(*s);
+        /* t->name is already lower-case */
+	r = *tk - tolower(*s);
 	tk++;
 	s++;
 	if (r) return r;
@@ -366,5 +365,5 @@ static int TokStrCmp(Token const *t, char const *s)
     /* Ignore trailing commas on s */
 
     if (!*s || (*s == ',' && !*(s+1))) return 0;
-    return (tolower(*tk) - tolower(*s));
+    return (*tk - tolower(*s));
 }

src/trigger.c

@@ -5,7 +5,8 @@
 /*  Routines for figuring out the trigger date of a reminder   */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -26,8 +27,8 @@
 
 #define ADVANCE_TO_WD(x, wd) while (! ((wd) & (1 << ((x)%7)))) (x)++
 
-static int JYear(int jul);
-static int JMonth(int jul);
+static int DSEYear(int dse);
+static int DSEMonth(int dse);
 static int NextSimpleTrig(int startdate, Trigger *trig, int *err);
 static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart);
 
@@ -39,7 +40,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
 /*  ONLY the day of week, day, month and year components.      */
 /*  Normally, returns -1 if the trigger has expired.  As a     */
 /*  special case, if D, M, Y [WD] are specified, returns the   */
-/*  Julian date, regardless of whether it's expired.  This is  */
+/*  DSE date, regardless of whether it's expired.  This is     */
 /*  so that dates with a REP can be handled properly.          */
 /*                                                             */
 /***************************************************************/
@@ -49,7 +50,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
     int d, m, y, j, d2, m2, y2;
 
     *err = 0;
-    FromJulian(startdate, &y, &m, &d);
+    FromDSE(startdate, &y, &m, &d);
     d2 = d;
     m2 = m;
     y2 = y;
@@ -72,17 +73,17 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    if (m == 12) { m = 0; y++; }
 	}
 	while (trig->d > DaysInMonth(m, trig->y)) m++;
-	j = Julian(y, m, trig->d);
+	j = DSE(y, m, trig->d);
 	return j;
 
     case GOT_MON:
 	if (m == trig->m) return startdate;
-	else if (m > trig->m) return Julian(y+1, trig->m, 1);
-	else return Julian(y, trig->m, 1);
+	else if (m > trig->m) return DSE(y+1, trig->m, 1);
+	else return DSE(y, trig->m, 1);
 
     case GOT_YR:
 	if (y == trig->y) return startdate;
-	else if (y < trig->y) return Julian(trig->y, 0, 1);
+	else if (y < trig->y) return DSE(trig->y, 0, 1);
 	else return -1;
 
     case GOT_DAY+GOT_MON:
@@ -94,10 +95,10 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	if (m > trig->m || (m == trig->m && d > trig->d)) y++;
 	/* Take care of Feb. 29 */
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
-	return Julian(y, trig->m, trig->d);
+	return DSE(y, trig->m, trig->d);
 
     case GOT_DAY+GOT_YR:
-	if (y < trig->y) return Julian(trig->y, 0, trig->d);
+	if (y < trig->y) return DSE(trig->y, 0, trig->d);
 	else if (y > trig->y) return -1;
 
 	if (d > trig->d) {
@@ -105,37 +106,37 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    if (m == 12) return -1;
 	}
 	while (trig->d > DaysInMonth(m, trig->y)) m++;
-	return Julian(trig->y, m, trig->d);
+	return DSE(trig->y, m, trig->d);
 
     case GOT_MON+GOT_YR:
 	if (y > trig->y || (y == trig->y && m > trig->m)) return -1;
-	if (y < trig->y) return Julian(trig->y, trig->m, 1);
+	if (y < trig->y) return DSE(trig->y, trig->m, 1);
 	if (m == trig->m) return startdate;
-	return Julian(trig->y, trig->m, 1);
+	return DSE(trig->y, trig->m, 1);
 
     case GOT_DAY+GOT_MON+GOT_YR:
 	if (trig->d > DaysInMonth(trig->m, trig->y)) {
 	    *err = E_BAD_DATE;
 	    return -1;
 	}
-	return Julian(trig->y, trig->m, trig->d);
+	return DSE(trig->y, trig->m, trig->d);
 
     case GOT_YR+GOT_WD:
 	if (y > trig->y) return -1;
-	if (y < trig->y) j = Julian(trig->y, 0, 1);
+	if (y < trig->y) j = DSE(trig->y, 0, 1);
 	else j = startdate;
         ADVANCE_TO_WD(j, trig->wd);
-	if (JYear(j) > trig->y) return -1;
+	if (DSEYear(j) > trig->y) return -1;
 	return j;
 
     case GOT_MON+GOT_WD:
 	if (m == trig->m) {
 	    j = startdate;
             ADVANCE_TO_WD(j, trig->wd);
-	    if (JMonth(j) == trig->m) return j;
+	    if (DSEMonth(j) == trig->m) return j;
 	}
-	if (m >= trig->m) j = Julian(y+1, trig->m, 1);
-	else j = Julian(y, trig->m, 1);
+	if (m >= trig->m) j = DSE(y+1, trig->m, 1);
+	else j = DSE(y, trig->m, 1);
         ADVANCE_TO_WD(j, trig->wd);
 	return j; /* Guaranteed to be within the month */
 
@@ -146,7 +147,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 
 	    /* If there are fewer days in previous month, no match */
 	    if (trig->d <= DaysInMonth(m2, y2)) {
-		j = Julian(y2, m2, trig->d);
+		j = DSE(y2, m2, trig->d);
                 ADVANCE_TO_WD(j, trig->wd);
 		if (j >= startdate) return j;
 
@@ -155,7 +156,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 
 	/* Try this month */
 	if (trig->d <= DaysInMonth(m, y)) {
-	    j = Julian(y, m, trig->d);
+	    j = DSE(y, m, trig->d);
             ADVANCE_TO_WD(j, trig->wd);
 	    if (j >= startdate) return j;
 	}
@@ -164,18 +165,18 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	m2 = m+1;
 	if (m2 > 11) { m2 = 0; y++; }
 	while (trig->d > DaysInMonth(m2, y)) m2++;
-	j = Julian(y, m2, trig->d);
+	j = DSE(y, m2, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
     case GOT_WD+GOT_YR+GOT_DAY:
 	if (y > trig->y+1 || (y > trig->y && m>0)) return -1;
 	if (y > trig->y) {
-	    j = Julian(trig->y, 11, trig->d);
+	    j = DSE(trig->y, 11, trig->d);
             ADVANCE_TO_WD(j, trig->wd);
 	    if (j >= startdate) return j;
 	} else if (y < trig->y) {
-	    j = Julian(trig->y, 0, trig->d);
+	    j = DSE(trig->y, 0, trig->d);
             ADVANCE_TO_WD(j, trig->wd);
 	    return j;
 	} else {
@@ -183,17 +184,17 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    if (m > 0) {
 		m2 = m-1;
 		while (trig->d > DaysInMonth(m2, trig->y)) m2--;
-		j = Julian(trig->y, m2, trig->d);
+		j = DSE(trig->y, m2, trig->d);
                 ADVANCE_TO_WD(j, trig->wd);
-                if (JYear(j) > trig->y) return -1;
+                if (DSEYear(j) > trig->y) return -1;
 		if (j >= startdate) return j;
 	    }
 	}
 	/* Try this month */
 	if (trig->d <= DaysInMonth(m, trig->y)) {
-	    j = Julian(trig->y, m, trig->d);
+	    j = DSE(trig->y, m, trig->d);
             ADVANCE_TO_WD(j, trig->wd);
-            if (JYear(j) > trig->y) return -1;
+            if (DSEYear(j) > trig->y) return -1;
 	    if (j >= startdate) return j;
 	}
 
@@ -201,9 +202,9 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	if (m == 11) return -1;
 	m++;
 	while (trig->d > DaysInMonth(m, trig->d)) m++;
-	j = Julian(trig->y, m, trig->d);
+	j = DSE(trig->y, m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
-        if (JYear(j) > trig->y) return -1;
+        if (DSEYear(j) > trig->y) return -1;
 	return j;
 
     case GOT_DAY+GOT_MON+GOT_WD:
@@ -220,34 +221,34 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
 
 	/* Try last year */
-	j = Julian(y, trig->m, trig->d);
+	j = DSE(y, trig->m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	if (j >= startdate) return j;
 
 	/* Try this year */
 	y++;
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
-	j = Julian(y, trig->m, trig->d);
+	j = DSE(y, trig->m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	if (j >= startdate) return j;
 
 	/* Must be next year */
 	y++;
 	while (trig->d > DaysInMonth(trig->m, y)) y++;
-	j = Julian(y, trig->m, trig->d);
+	j = DSE(y, trig->m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
     case GOT_WD+GOT_MON+GOT_YR:
 	if (y > trig->y || (y == trig->y && m > trig->m)) return -1;
 	if (trig->y > y || (trig->y == y && trig->m > m)) {
-	    j = Julian(trig->y, trig->m, 1);
+	    j = DSE(trig->y, trig->m, 1);
             ADVANCE_TO_WD(j, trig->wd);
 	    return j;
 	} else {
 	    j = startdate;
             ADVANCE_TO_WD(j, trig->wd);
-	    FromJulian(j, &y2, &m2, &d2);
+	    FromDSE(j, &y2, &m2, &d2);
 	    if (m2 == trig->m) return j; else return -1;
 	}
 
@@ -256,7 +257,7 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 	    *err = E_BAD_DATE;
 	    return -1;
 	}
-	j = Julian(trig->y, trig->m, trig->d);
+	j = DSE(trig->y, trig->m, trig->d);
         ADVANCE_TO_WD(j, trig->wd);
 	return j;
 
@@ -269,25 +270,25 @@ static int NextSimpleTrig(int startdate, Trigger *trig, int *err)
 
 /***************************************************************/
 /*                                                             */
-/*  JMonth - Given a Julian date, what's the month?            */
+/*  DSEMonth - Given a DSE date, what's the month?             */
 /*                                                             */
 /***************************************************************/
-static int JMonth(int jul)
+static int DSEMonth(int dse)
 {
     int y, m, d;
-    FromJulian(jul, &y, &m, &d);
+    FromDSE(dse, &y, &m, &d);
     return m;
 }
 
 /***************************************************************/
 /*                                                             */
-/*  JYear - Given a Julian date, what's the year?              */
+/*  DSEYear - Given a DSE date, what's the year?               */
 /*                                                             */
 /***************************************************************/
-static int JYear(int jul)
+static int DSEYear(int dse)
 {
     int y, m, d;
-    FromJulian(jul, &y, &m, &d);
+    FromDSE(dse, &y, &m, &d);
     return y;
 }
 
@@ -297,7 +298,7 @@ static int JYear(int jul)
 /*                                                             */
 /*  Given a trigger, compute the next trigger date.            */
 /*                                                             */
-/*  Returns the Julian date of next trigger, -1 if             */
+/*  Returns the DSE date of next trigger, -1 if                */
 /*  expired, -2 if can't compute trigger date.                 */
 /*                                                             */
 /***************************************************************/
@@ -439,7 +440,7 @@ AdjustTriggerForDuration(int today, int r, Trigger *trig, TimeTrig *tim, int sav
 	/* Change trigger date to today */
 	r = today;
 	if (DebugFlag & DB_PRTTRIG) {
-	    FromJulian(r, &y, &m, &d);
+	    FromDSE(r, &y, &m, &d);
 	    fprintf(ErrFp, "%s(%d): Trig(adj) = %s, %d %s, %d",
 		    FileName, LineNo,
 		    get_day_name(r % 7),
@@ -530,7 +531,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
     *err = OK;
 
     /* But check for obvious problems... */
-    if (trig->localomit == 1 + 2 + 4 + 8 + 16 + 32 + 64) {
+    if ((WeekdayOmits | trig->localomit) == 0x7F) {
 	*err = E_2MANY_LOCALOMIT;
 	return -1;
     }
@@ -590,7 +591,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
 		LastTrigValid = 1;
 	    }
 	    if (DebugFlag & DB_PRTTRIG) {
-		FromJulian(result, &y, &m, &d);
+		FromDSE(result, &y, &m, &d);
 		fprintf(ErrFp, "%s(%d): Trig = %s, %d %s, %d",
 			FileName, LineNo,
 			get_day_name(result % 7),
@@ -621,12 +622,10 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
 		fprintf(ErrFp, "%s(%d): %s\n",
 			FileName, LineNo, ErrMsg[E_EXPIRED]);
 	    }
-	    if (result != -1) {
-		if (save_in_globals) {
-		    LastTriggerDate = result;
-		    LastTrigValid = 1;
-		}
-	    }
+            if (save_in_globals) {
+                LastTriggerDate = result;
+                LastTrigValid = 1;
+            }
 	    return -1;
 	}
 
@@ -639,12 +638,10 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
 
 	/* Keep scanning... unless there's no point in doing it.*/
 	if (nextstart <= start) {
-	    if (result != -1) {
-		if (save_in_globals) {
-		    LastTriggerDate = result;
-		    LastTrigValid = 1;
-		}
-	    }
+            if (save_in_globals) {
+                LastTriggerDate = result;
+                LastTrigValid = 1;
+            }
 	    trig->expired = 1;
 	    if (DebugFlag & DB_PRTTRIG) {
 		fprintf(ErrFp, "%s(%d): %s\n",
@@ -661,40 +658,3 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig *tim,
     return -1;
 }
 
-/***************************************************************/
-/*                                                             */
-/*  ComputeScanStart                                            */
-/*                                                             */
-/*  Figure out where to start scan from by examining SCANFROM  */
-/*  and DURATION                                               */
-/*                                                             */
-/***************************************************************/
-int
-ComputeScanStart(int today, Trigger *trig, TimeTrig *tt)
-{
-    int minutes, days;
-
-    /* If we don't have a time/duration, just use scanfrom */
-    if (tt->ttime == NO_TIME ||
-	tt->duration == NO_TIME) {
-	if (trig->scanfrom == NO_DATE) {
-	    return today;
-	}
-	return trig->scanfrom;
-    }
-
-    /* Calculate time-based SCANFROM */
-    minutes = tt->ttime + tt->duration - 1;
-
-    /* Figure out how many days to scan backwards from */
-    days = minutes / MINUTES_PER_DAY;
-
-    if (trig->scanfrom != NO_DATE) {
-	if (trig->scanfrom <= today - days) {
-	    return trig->scanfrom;
-	} else {
-	    return today - days;
-	}
-    }
-    return today - days;
-}

src/types.h

@@ -5,7 +5,8 @@
 /*  Type definitions all dumped here.                          */
 /*                                                             */
 /*  This file is part of REMIND.                               */
-/*  Copyright (C) 1992-2021 by Dianne Skoll                    */
+/*  Copyright (C) 1992-2023 by Dianne Skoll                    */
+/*  SPDX-License-Identifier: GPL-2.0-only                      */
 /*                                                             */
 /***************************************************************/
 
@@ -77,6 +78,7 @@ typedef struct {
     int eventduration;           /* Original event duration (minutes) */
     int maybe_uncomputable;      /* Suppress "can't compute trigger" warnings */
     int addomit;                 /* Add trigger date to global OMITs */
+    int noqueue;                 /* Don't queue even if timed */
     char sched[VAR_NAME_LEN+1];  /* Scheduling function */
     char warn[VAR_NAME_LEN+1];   /* Warning function    */
     char omitfunc[VAR_NAME_LEN+1]; /* OMITFUNC function */
@@ -155,8 +157,8 @@ enum TokTypes
   /* Commands first */
   T_Rem, T_Push, T_Pop, T_Preserve, T_Include, T_IncludeR, T_IncludeCmd, T_If, T_Else, T_EndIf,
   T_IfTrig, T_ErrMsg,
-  T_Set, T_UnSet, T_Fset, T_Omit, T_Banner, T_Exit,
-  T_AddOmit,
+  T_Set, T_UnSet, T_Fset, T_Funset, T_Omit, T_Banner, T_Exit,
+  T_AddOmit, T_NoQueue,
   T_WkDay,
   T_Month, T_Time, T_Date, T_DateTime,
   T_Skip, T_At, T_RemType, T_Until, T_Year, T_Day, T_Rep, T_Delta,
@@ -238,6 +240,6 @@ typedef struct {
 /* Pure JSON */
 #define PSCAL_LEVEL3  3
 
-#define TERMINAL_BACKGROUND_UNKNOWN 0
-#define TERMINAL_BACKGROUND_DARK    1
-#define TERMINAL_BACKGROUND_LIGHT   2
+#define TERMINAL_BACKGROUND_UNKNOWN -1
+#define TERMINAL_BACKGROUND_DARK    0
+#define TERMINAL_BACKGROUND_LIGHT   1