Fix release date.

Remove tests that break on 32-bit systems.

configure.in

@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(src/queue.c)
+AC_INIT
+AC_CONFIG_SRCDIR([src/queue.c])
 
 cat <<'EOF'
 
@@ -12,7 +13,7 @@ cat <<'EOF'
 
 EOF
 
-AC_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS([src/config.h])
 
 AC_ARG_ENABLE(perl-build-artifacts,
 [  --disable-perl-build-artifacts
@@ -29,10 +30,12 @@ AC_PATH_PROG([PERL], [perl])
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, sqrt)
+AC_CHECK_HEADERS_ONCE([sys/time.h])
 
 dnl Integer sizes
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(time_t)
 
 dnl Checks for header files.
 AC_CHECK_HEADERS(sys/types.h glob.h wctype.h locale.h langinfo.h)
@@ -42,8 +45,6 @@ AC_STRUCT_TM
 
 dnl Checks for library functions.
 AC_FUNC_UTIME_NULL
-AC_HEADER_TIME
-
 if test "$GCC" = yes; then
 	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
         # Check for link-time optimization support
@@ -65,6 +66,12 @@ if test "$GCC" = yes; then
         fi
 fi
 
+dnl If sizeof(time_t) is 4, try to get 64-bit time_t
+if test "$ac_cv_sizeof_time_t" = "4" ; then
+    AC_MSG_NOTICE([time_t is 32-bits on this system; attempting to use 64-bit time_t])
+    CFLAGS="$CFLAGS -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
+fi
+
 if test "$ac_cv_perlartifacts" = "yes" ; then
     PERLARTIFACTS=
 else
@@ -80,10 +87,12 @@ if test "$?" != 0 ; then
     exit 1
 fi
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=04.02.05
+
+VERSION=04.02.07
 AC_SUBST(VERSION)
 AC_SUBST(PERL)
 AC_SUBST(PERLARTIFACTS)
 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)
+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])
+AC_OUTPUT
 chmod a+x rem2pdf/bin/rem2pdf

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

@@ -514,6 +514,7 @@ Acts on the region or places point where it needs to be."
   (set (make-local-variable 'comment-start) ";")
   (set (make-local-variable 'comment-start) "#")
   (set (make-local-variable 'comment-end) "\n")
+  (set (make-local-variable 'comment-end-skip) "[ \t]*\\(\\s>\\||#\\)")
   (set (make-local-variable 'skeleton-end-hook) nil) ; so the skeletons will not automatically go to a new line.
   (set (make-local-variable 'fill-column) '100);cause I was having problems with autofill.
   (set (make-local-variable 'indent-line-function) 'remind-indent-line)

docs/WHATSNEW

@@ -1,5 +1,63 @@
 CHANGES TO REMIND
 
+* VERSION 4.2 Patch 7 - 2023-10-09
+
+- IMPROVEMENT: remind: On 32-bit systems, attempt to use a 64-bit time_t
+  if the C library supports that.  This lets Remind work properly with
+  dates after 2038 in the few cases it has to call mktime() internally.
+
+- MINOR NEW FEATURE: remind: Attempt to obtain the terminal background
+  color using an OSC sequence.  This normally only happens if standard
+  output is a terminal, but can be forced with the '-@..,t' option.
+
+- MINOR NEW FEATURE: remind: Add "--version" long option to print out
+  Remind's version and exit.
+
+- MINOR IMPROVEMENT: tkremind: Use a higher-resolution PNG image for
+  the icon.
+
+- MINOR IMPROVEMENT: remind-conf-mode.el: Update highlighting rules
+  courtesy of Bill Benedetto
+
+- MINOR CHANGE: Make AT optional.  If we encounter a TIME in a REM
+  command, implicitly begin an AT clause.
+
+- DOCUMENTATION: Many minor fixes and improvements courtesy of Dan Jacobson.
+
+- BUG FIX: Make "-w0" set the calendar width based on standard output
+  rather than setting it to zero and causing an infinite loop.
+
+* VERSION 4.2 Patch 6 - 2023-09-12
+
+- NEW FEATURE: remind: The "nonomitted()" function takes an optional
+  extra INT argument called "step".  See man page for details.  Also
+  allows the "start" argument to be greater than the "end" argument,
+  in which case they are effectively swapped.
+
+- NEW FEATURE: remind: The "slide()" function takes an optional extra
+  INT argument called "step", similar to "nonomitted()".  See man page
+  for details.
+
+- NEW FEATURE: remind: Added the $ParseUntriggered system variable;
+  see the man page for details.  You almost certainly will never need
+  to use this.
+
+- NEW FILE: holidays/ie.rem: Added Irish holidays, courtesy of
+  Amy de Buitléir.
+
+- CHANGE: remind: The "-tn" option sets all REM statement deltas to
+  ++n rather than adding n to any existing REM statement's delta.
+  Additionally, the corresponding system variable $DeltaOffset has
+  been renamed to $DeltaOverride.
+
+- NEW OPTION: remind: Add the "-tz" option to explicitly set all
+  REM statement deltas to zero.
+
+- DOCUMENTATION FIX: remind: various documentation improvements.
+
+- BUG FIX: Correct some errors in Italian localization, courtesy of
+  Emanuele Torre
+
 * VERSION 4.2 Patch 5 - 2023-04-11
 
 - MINOR IMPROVEMENT: remind: If someone uses OMIT yyyy-mm-dd UNTIL yyyy-mm-dd

examples/astro

@@ -8,15 +8,13 @@
 # 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'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
 
@@ -24,24 +22,25 @@ 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
+IF $TerminalBackground == 0
    SPECIAL COLOR 255 255 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
    SPECIAL COLOR 255 128 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+ELSE
+   SPECIAL COLOR 128 128 0 Sunrise:               🌅 [sunrise()] today and [sunrise($T+1)] tomorrow
+   SPECIAL COLOR 128 32 0 Sunset:                🌇 [sunset()] today and [sunset($T+1)] tomorrow%_
+
 ENDIF
 EOF
 
-remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
-IF bg_dark
+IF $TerminalBackground == 0
    REM [moondatetime(0)] +60 SPECIAL COLOR 255 255 0 New moon:              🌑 [$T] %3 (%b)
    REM [moondatetime(1)] +60 SPECIAL COLOR 255 255 128 First Quarter:         🌓 [$T] %3 (%b)
    REM [moondatetime(2)] +60 SPECIAL COLOR 255 255 255 Full moon:             🌕 [$T] %3 (%b)
    REM [moondatetime(3)] +60 SPECIAL COLOR 255 255 128 Last Quarter:          🌗 [$T] %3 (%b)
 ELSE
-   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)
@@ -51,7 +50,7 @@ EOF
 
 echo ""
 
-remind -g -ibg_dark="$bg_dark" "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
+remind -g "-i\$Latitude=\"$latitude\"" "-i\$Longitude=\"$longitude\"" -q -@2 - "$@" <<'EOF'
 SET $AddBlankLines 0
 BANNER %
 

include/holidays/ie.rem

@@ -0,0 +1,42 @@
+;
+; Irish Holidays
+;
+; The dates for the Public ("bank") holidays are taken from the following site:
+; https://www.citizensinformation.ie/en/employment/employment-rights-and-conditions/leave-and-holidays/public-holidays/
+;
+; This file was derived from:
+; https://github.com/mhwombat/dotWombat/blob/master/.config/remind/IrishHolidays.rem
+; by Amy de Buitléir.
+
+; fixed dates
+OMIT 31 December MSG New Year's Eve (Oíche Chinn Bliana) Public Holiday
+OMIT 1 January MSG New Year's Day (Lá Caille, Lá Bliana Nua) Public Holiday
+OMIT 17 March MSG Saint Patrick's Day (Lá Fhéile Pádraig) Public Holiday
+OMIT 24 December MSG Christmas Eve (Oíche Nollag) Public Holiday
+OMIT 25 December MSG Christmas Day (Lá Nollag) Public Holiday
+OMIT 26 December MSG Saint Stephen's Day, Wren Day (Lá Fhéile Stiofáin, Lá an Dreoilín) Public Holiday
+
+; moving dates
+
+; First Monday in May
+REM Monday 1 May SCANFROM -7 ADDOMIT MSG May Day (Lá Bealtaine) Public Holiday
+
+; First Monday in June
+REM Monday 1 June SCANFROM -7 ADDOMIT MSG June Public Holiday
+
+; First Monday in August
+REM Monday 1 August SCANFROM -7 ADDOMIT MSG August Public Holiday
+
+; Last Monday in October
+REM Monday 1 -7 November SCANFROM -7 ADDOMIT MSG October Public Holiday
+
+; Easter
+SET easter easterdate(today())
+REM [TRIGGER(easter-2)] MSG Good Friday (Aoine an Chéasta)
+REM [TRIGGER(easter)] MSG Easter Sunday (Domhnach Cásca)
+OMIT [TRIGGER(easter+1)] MSG Easter Monday (Luan Cásca) Public Holiday
+
+; St. Brigid's Day
+REM 1 February MSG Saint Brigid's Day (Lá Fhéile Bríde or Imbolc)
+; The public holiday is the first Monday in February, or 1 February if the date falls on a Friday
+REM February SCANFROM -7 ADDOMIT SATISFY [($Td==1 && $Tw==5) || ($Td<8 && $Tw==1 && $Td!=4)] MSG Public Holiday

include/lang/it.rem

@@ -4,11 +4,11 @@
 # 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 $Monday "Lunedì"
+SET $Tuesday "Martedì"
+SET $Wednesday "Mercoledì"
+SET $Thursday "Giovedì"
+SET $Friday "Venerdì"
 SET $Saturday "Sabato"
 
 SET $January "Gennaio"
@@ -40,7 +40,7 @@ SET $Now "ora"
 SET $At "alle"
 SET $Minute "minuto"
 SET $Hour "ora"
-SET $Is "é"
+SET $Is "è"
 SET $Was "era"
 SET $And "e"
 SET $Hplu "a"

man/rem.1.in

@@ -19,4 +19,4 @@ Remind was written by Dianne Skoll <dianne@skoll.ca>
 .SH HOME PAGE
 https://dianne.skoll.ca/projects/remind/
 .SH SEE ALSO
-\fBremind\fR
+\fBremind\fR(1)

man/rem2ps.1.in

@@ -327,7 +327,7 @@ calendar.
 .SH REM2PS INPUT FORMAT (-P OPTION)
 The \fB\-p\fR option is an older, simpler interchange format used by
 \fBRemind\fR to communicate with back-ends.  New back-ends are
-encoraged to support the new \fB\-pp\fR format preferably, though they
+encouraged to support the new \fB\-pp\fR format preferably, though they
 are encouraged to support the older \fB\-p\fR format as well if the
 older format contains enough information for them to work properly.
 .PP

man/remind.1.in

@@ -28,6 +28,10 @@ Anything after the __EOF__ marker is completely ignored.
 \fBRemind\fR has a slew of options.  If you're new to the program,
 ignore them for now and skip to the section "REMINDER FILES".
 .TP
+.B \-\-version
+The \fB\-\-version\fR option causes \fBRemind\fR to print its version number
+to standard output and then exit.
+.TP
 .B \-n
 The \fB\-n\fR option causes \fBRemind\fR to print the \fBnext\fR occurrence
 of each reminder in a simple calendar format.  You can sort this by
@@ -60,7 +64,9 @@ weeks to be produced.
 .B 'a'
 causes \fBRemind\fR to display reminders on the calendar on the
 day they actually occur \fIas well as\fR on any preceding days
-specified by the reminder's \fIdelta\fR.
+specified by the reminder's \fIdelta\fR.  This \fIalso\fR causes
+\fBRemind\fR to include text outside %"...%" sequences that would
+otherwise be removed (though the actual %" markers themselves are removed.)
 .TP
 .B 'l'
 causes \fBRemind\fR to use VT100 line-drawing characters to draw
@@ -103,11 +109,18 @@ If the optional \fIm\fR parameter is supplied following a comma, then
 \fIm\fR=0 tells \fBRemind\fR that the terminal background is dark, and
 \fBRemind\fR will brighten up dark colors to make them visible.  If
 \fIm\fR=1, then \fBRemind\fR assumes the terminal background is light
-and it will darken bright colors to make them visible.  If no \fIm\fR
-is supplied, or it is supplied as \fIm\fR=2, then \fBRemind\fR does
-not perform any adjustments, and some reminders may be hard or
-impossible to see if the color is too close to the terminal background
-color.
+and it will darken bright colors to make them visible.  If \fIm\fR is
+specified as 2, then \fBRemind\fR does not perform any adjustments,
+and some reminders may be hard or impossible to see if the color is
+too close to the terminal background color.  If you supply the letter
+\fBt\fR rather than a number, then Remind attempts to guess the background
+color of the terminal, \fIeven if\fR stdout is not a terminal.
+.PP
+On startup, if the standard output is a terminal, \fBRemind\fR
+attempts to determine if the terminal background is dark or light by
+sending a special escape sequence to determine the background color.
+The \fIm\fR parameter can override this check (or force it if
+\fIm\fR is given as \fBt\fR.)
 .PP
 If the optional \fIb\fR parameter is supplied following a comma, then
 \fIb=0\fR tells \fBRemind\fR to ignore SPECIAL SHADE reminders (the
@@ -222,8 +235,14 @@ regardless of the \fIdelta\fR supplied for each reminder.
 .TP
 .B \-t\fR\fIn\fR
 If you supply a number \fIn\fR after the \fB\-t\fR option, then
-\fBRemind\fR pretends that each non-expired reminder has a \fIdelta\fR
-of \fIn\fR days and triggers reminders accordingly.
+\fBRemind\fR pretends that echo \fBREM\fR command has a delta
+of \+\+\fIn\fR, regardless of any existing delta.
+.TP
+.B \-tz\fR
+If you supply the letter \fBz\fR after the \fB\-t\fR option, then
+\fBRemind\fR sets all REM statements' deltas to zero, regardless of the
+value supplied in the REM statement itself.  In effect, this disables
+all deltas of the form \fB\+\fIn\fR and \fB\+\+\fIn\fR.
 .TP
 .B \-tt\fR[\fIn\fR]
 The \fB-tt\fR option causes \fBRemind\fR to assume a default delta of
@@ -602,6 +621,11 @@ The following examples show how date specifications are interpreted.
 .PP
 1. Null date specification - the reminder is triggered every day.
 The trigger date for a specific run is simply the current system date.
+For example:
+.PP
+.nf
+        REM MSG This is triggered every time Remind runs
+.fi
 .PP
 2. Only
 .I day
@@ -1782,7 +1806,7 @@ will begin reading from standard input.
 .PP
 If you specify a \fIdirectory\fR as the argument to \fBINCLUDE\fR, then
 \fBRemind\fR will process all files in that directory that match the shell
-patterm "*.rem".  The files are processed in sorted order; the sort order
+pattern "*.rem".  The files are processed in sorted order; the sort order
 matches that used by the shell when it expands "*.rem".
 .PP
 Note that the file specified by an \fBINCLUDE\fR command is interpreted
@@ -2390,6 +2414,10 @@ is normally 0, but can be set with the \fB\-tt\fR option or explicitly
 set in your script.  If \fB$DefaultDelta\fR is non-zero, you can use an
 explicit delta of +0 in an AT clause to countermand the default delta.
 .TP
+.B $DeltaOverride (read-only)
+If non-zero, corresponds to the \fIn\fR argument given to a
+\fB\-t\fR\fIn\fR command-line option.
+.TP
 .B $DontFork (read-only)
 If non-zero, then the \fB\-c\fR option was supplied on the command line.
 .TP
@@ -2456,7 +2484,8 @@ or a date different from today's true date was supplied.  If non-zero,
 then \fBONCE\fR directives will be ignored.
 .TP
 .B $InfDelta (read-only)
-If non-zero, then the \fB\-t\fR option was supplied on the command line.
+If non-zero, then the \fB\-t\fR option was supplied on the command line,
+with no \fIn\fR argument.
 .TP
 .B $IntMax (read-only)
 The largest representable \fBINT\fR.  On a machine with 32-bit signed integers
@@ -2577,6 +2606,28 @@ by \fBREM\fR commands; triggers in \fBIFTRIG\fR commands do
 not affect it.
 .RE
 .TP
+.B $ParseUntriggered
+A flag indicating whether or not \fBRemind\fR should fully parse \fBREM\fR
+statements that are not triggered.  0 means to skip parsing them and 1
+(the default) means to parse them.
+.PP
+.RS
+For example, if we have the following \fBREM\fR statement:
+.PP
+.nf
+            REM 2020-01-01 MSG ["bad_expression" * 2]
+.fi
+.PP
+Then by default, \fBRemind\fR will fully parse the line and issue
+a "Type mismatch" error even if the reminder is not triggered.  However,
+if \fB$ParseUntriggered\fR is set to 0, then \fBRemind\fR will not
+issue the error except on 2020-01-01, when the reminder is triggered.
+.PP
+Setting \fB$ParseUntriggered\fR to 0 may in some cases slightly
+improve performance, at the risk of not catching errors until a
+reminder is triggered.
+.RE
+.TP
 .B $PrefixLineNo (read-only)
 If non-zero, then the \fB\-l\fR option was supplied on the command line.
 .TP
@@ -2678,9 +2729,13 @@ Set to 1 if the \fB\-@1\fR option was used; 0 otherwise.
 Set to 1 if the \fB\-@2\fR option was used; 0 otherwise.
 .TP
 .B $TerminalBackground (read-only)
-Returns -1 if the terminal background color was not specified,
-0 if it was specified as dark with the \fB\-@,0\fR option or
-1 if it was specified as light with the \fB\-@,1\fR option.
+Returns -1 if the terminal background color could not be determined, 0
+if it was found to be dark (or was specified as dark with the
+\fB\-@,0\fR option) or 1 if it was found to be light (or specified as
+light with the \fB\-@,1\fR option.)  The terminal background is considered
+to be "dark" if the average of the red, green and blue components is
+at most 85 out of 255, and if the maximum of any component is at most
+128 out of 255.
 .PP
 Note:  If any of the calendar modes are in effect, then the
 values of $Daemon, $DontFork, $DontTrigAts, $DontQueue, $HushMode,
@@ -3258,14 +3313,31 @@ is supplied, only the date component is used.
 Returns the time of "nautical twilight" on the specified \fIdate\fR.  If
 \fIdate\fR is omitted, defaults to \fBtoday()\fR.
 .TP
-.B nonomitted(dq_start, dq_end [,s_wkday...])
+.B nonomitted(dq_start, dq_end [, i_step] [,s_wkday...])
 This function returns the number of \fInon-\fRomitted days between
 \fIstart\fR and \fIend\fR.  If \fIstart\fR is non-omitted, then it is
 counted.  \fIend\fR is never counted.
 .RS
 .PP
-Note that \fIend\fR must be greater than or equal to \fIstart\fR or an
-error is reported.  In addition to using the global OMIT context, you
+Note that if \fIend\fR is less than \fIstart\fR, the arguments
+are effectively swapped, so counting always begins from the older
+date.
+.PP
+If the third argument to \fBnonomitted\fR is an \fBINT\fR, then it must
+be greater than zero, and is consider to be the \fIstep\fR by which
+\fBnonomitted\fR counts.  For example the following expression:
+.PP
+.nf
+        nonomitted('2023-07-01', '2023-07-29', 7)
+.fi
+.PP
+returns the number of non-omitted Saturdays from 2023-07-01 up to
+(but not including) 2023-07-29.  (Both 2023-07-01 and 2023-07-29 are
+Saturdays.)
+.PP
+If no \fIstep\fR argument is supplied, then a step of 1 is used.
+.PP
+In addition to using the global OMIT context, you
 can supply additional arguments that are names of weekdays to be
 omitted.  However, in a \fBREM\fR command, any local \fBOMITFUNC\fR
 clause is \fInot\fR taken into account by this function.
@@ -3292,7 +3364,7 @@ reminder will label day numbers in a calendar:
 .fi
 .PP
 Obviously, the answer you get from \fBnonomitted\fR depends on the global
-OMIT context.  If you use moveable OMITs, you may get inconsistent results.
+OMIT context.  If you use movable OMITs, you may get inconsistent results.
 .PP
 Here is a more complex use for \fBnonomitted\fR.  My garbage collection
 follows two interleaved 14-day cycles: One Friday, garbage and paper
@@ -3486,10 +3558,13 @@ will set \fBa\fR to:
 .fi
 
 .TP
-.B slide(d_start, i_amt [,s_wkday...])
+.B slide(d_start, i_amt [, i_step] [,s_wkday...])
 This function is the inverse of \fBnonomitted\fR.  It adds \fIamt\fR
-days (which can be negative) to \fIstart\fR, \fInot counting omitted days\fR.
-The optional \fIwkday\fR arguments are additional weekday names to omit.
+(which can be negative) chunks of \fIstep\fR days to \fIstart\fR,
+\fInot counting omitted days\fR.  If \fIstep\fR is not supplied, then
+it is assumed to be 1.  Note that only every \fIstep\fRth day is
+tested to see if it is omitted.  The optional \fIwkday\fR arguments
+are additional weekday names to omit.
 .RS
 .PP
 Consider this example:
@@ -3509,6 +3584,26 @@ May 16 and 17.  You can go backwards, too, so:
 .fi
 .PP
 takes \fIa\fR back to 2009-05-13.
+.PP
+Now consider this example:
+.PP
+.nf
+        OMIT 14 May 2009
+        SET a slide('2009-05-07', 2, 7)
+.fi
+.PP
+This sets \fIa\fR to '2009-05-28' because we skip ahead two weeks, not
+counting a week where the day we land on happens to be omitted.  Contrast with
+this:
+.PP
+.nf
+        OMIT 13 May 2009
+        SET a slide('2009-05-07', 2, 7)
+.fi
+.PP
+which sets \fIa\fR to '2009-05-21'.  Although 2009-05-13 is omitted, we
+don't "land" on it as we step forward in chunks of 7 days, so we never
+see that it is omitted.
 .RE
 .TP
 .B soleq(i_which [, dqi_start])
@@ -4216,7 +4311,7 @@ you define a function taking no parameters.  Here are some examples:
 .nf
 	FSET double(x) 2*x
 	FSET yeardiff(date1, date2) year(date1) - year(date2)
-	FSET since(x) ord(year(trigdate())\-x)
+	FSET since(x) ord($Ty \- x)
 .fi
 .PP
 The last function is useful in birthday reminders.  For example:
@@ -4231,6 +4326,12 @@ Dean was born in 1984.  The above example, on 1 November 1992, would print:
 	Dean's 8th birthday is today.
 .fi
 .PP
+Similarly, the function is useful in anniversary reminders.  For example:
+.PP
+.nf
+        REM 4 June MSG [since(1989)] anniversary of the Tienanmen Square massacre
+.fi
+.PP
 Notes:
 .TP
 o
@@ -5449,7 +5550,7 @@ The \fBSPECIAL\fR keyword is used to transmit "out-of-band" information
 to \fBRemind\fR backends, such as \fBtkremind\fR or \fBRem2PS\fR.
 They are used only when piping data from a \fBremind \-p\fR line.
 (Note that the COLOR special is an exception; it downgrades to the
-equivalent of MSG in \fBremind's\fR normal mode of operation.)
+equivalent of MSG in \fBRemind's\fR normal mode of operation.)
 .PP
 The various \fBSPECIAL\fRs recognized are particular for each
 backend; however, there are four \fBSPECIAL\fRs that all backends
@@ -5538,7 +5639,7 @@ after the WEEK keyword.
 .PP
 .SH MISCELLANEOUS
 .PP
-.B COMMAND ABBREVIATIONS
+.B COMMAND AND KEYWORD ABBREVIATIONS
 .PP
 The following tokens can be abbreviated:
 .TP
@@ -5565,6 +5666,9 @@ o
 \fBINCLUDE\fR --> \fBINC\fR
 .TP
 o
+\fBMAYBE-UNCOMPUTABLE\fR --> \fBMAYBE\fR
+.TP
+o
 \fBSCANFROM\fR --> \fBSCAN\fR
 .PP
 .B NIFTY EXAMPLES
@@ -5737,6 +5841,25 @@ components, then \fBRemind\fR will correctly compute a trigger date, even
 if it happens to be before the start of scanning.
 Note that this behaviour is not true for
 versions of \fBRemind\fR prior to 03.00.01.
+.SH FILES
+.PP
+The traditional location of your reminders file or directory is:
+.PP
+.nf
+        $HOME/.reminders
+.fi
+.PP
+where \fB$HOME\fR is your home directory.
+.PP
+Remind ships with some preinstalled files for holidays and language
+packs.  These are located in the following directory:
+.PP
+.nf
+        @prefix@/share/remind/
+.fi
+.PP
+Do not hard-code the above directory in your reminder files.  Instead,
+use the value of the $SysInclude system variable.
 .SH AUTHOR
 .PP
 Dianne Skoll <dianne@skoll.ca> wrote \fBRemind\fR.  The moon code
@@ -5784,9 +5907,11 @@ Liviu Daia
 Rafa Couto
 .PP
 \fBIcelandic\fR --
-Bj\(:orn Dav\('i\[Sd]sson
+Bj\[:o]rn Daví\[Sd]sson
 .SH BUGS
 .PP
+If you find a bug in Remind, please report it to: dianne@skoll.ca
+.PP
 There's no good reason why read-only system variables are not
 implemented as functions, or why functions like \fBversion()\fR, etc.
 are not implemented as read-only system variables.
@@ -5809,6 +5934,8 @@ Richard Siegel and Michael and Sharon Strassfeld, \fIThe First Jewish
 Catalog\fR, Jewish Publication Society of America.
 .SH HOME PAGE
 https://dianne.skoll.ca/projects/remind/
+.SH MAILING LIST
+https://dianne.skoll.ca/mailman/listinfo/remind-fans
 .SH SEE ALSO
 .PP
 \fBrem\fR(1), \fBrem2ps\fR(1), \fBrem2pdf\fR(1), \fBtkremind\fR(1), \fBrem2html\fR(1)

scripts/tkremind

@@ -29,31 +29,62 @@ set Hostname [exec hostname]
 # Our icon photo
 catch {
     image create photo rpicon -data {
-R0lGODlhFwAgAOecABUTERYTERYUERcVEhgWExkXFBkXFRoXFRsZFhwZFxwa
-GB0bGR4cGR4cGh8dGiAeHCEfHCEfHSIgHSIgHiQiHyYkISknJCooJispJywq
-Jy4sKTIwLjUzMDUzMTo4Njs5Nzs5ODw7ODw7OT07OT48OkE/PUJAPkNBP0RC
-QEVDQUVEQkdFQ0lIRkpJR01LSU5MSlBPTVFQTlNSUFRSUFRSUVVTUlVUUllY
-VltZV1xaWF1cWmBfXmJgX2RiYGZlY2dmZGppZ2tqaG1ram9tbHFwb3Jwb3Rz
-cXV0c3Z0c3Z1c3Z1dHd1dHh2dXh3dnt5eHx7eXx7en18en59e4B/foGAf4KB
-f4SDgYWEgoWEg4eGhIiHhouKiI2Mio6Ni46NjJCQj5KRkJSTkZeWlpiXlpmY
-l5qZmJybmp6dnKCfnqGgoKKhoKOioaSjoqinp6qpqKurqq+urbCvrrCwr7Gw
-r7OysbW1tLi3tri3t7u6ur28vMTDw8TEw8XFxMbFxcfGxsfHxsrJycrKyczM
-y83My83MzM3NzdDQz9LR0dPS0tPT09fX19jY19ra2dvb29zc29zc3Ojn5+jo
-6Orq6uzs7O/v7/T09PX19fb29vf39/r6+vv7+/7+/v//////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////
-/////////////////////yH5BAEKAP8ALAAAAAAXACAAAAj+AP8JHEiwoMGD
-CAcusRAAQEKDBQIcEBAAwUODAQJAsBGAwsWCBzJuUBLgI0ENGVM2dACg5UWV
-KU+Y/JfRQBknPoq8ATQz4wxOQIFa6vMx5ZSgQetczJDSClKgcF6mFDEnE9I2
-D0fADOChUdA1D7dmTBEUTditDQRQAnomIQaxICpoAmomoUoAGS2YIBIUDEIu
-YndI8FAJaBaEMlIuSEkloxugUBBOSLkh44AvGfkAPYJQpYqMLIQEILB205DO
-KW9kJHMhQAmgkaKgzsgjggM5GbEAxaNmdoAPOoz8CCAgEVAtg3wPEPMnQQAU
-QWsg5AAzDZSMbIBeaoHwAUwSDAI2XMAENA8ThAPEBvAStEkc3yonrOW0aUMk
-+BkBVAlaKATC8Fsp8Igid5ABgxMHtaTgggy6ZFBAADs=    }
+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 }
 
     wm iconphoto . -default rpicon
 }

src/dorem.c

@@ -199,9 +199,11 @@ int DoRem(ParsePtr p)
     } else {
         /* Parse the rest of the line to catch any potential
            expression-pasting errors */
-        while (ParseChar(p, &r, 0)) {
-            if (r != 0) {
-                break;
+        if (ParseUntriggered) {
+            while (ParseChar(p, &r, 0)) {
+                if (r != 0) {
+                    break;
+                }
             }
         }
     }
@@ -348,6 +350,16 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 	    if (r) return r;
 	    break;
 
+        /* A time implicitly introduces an AT if AT is not explicit */
+        case T_Time:
+            DBufFree(&buf);
+            if (tim->ttime != NO_TIME) return E_TIME_TWICE;
+            tim->ttime = tok.val;
+            r = ParseTimeTrig(s, tim, save_in_globals);
+            if (r) return r;
+	    trig->duration_days = ComputeTrigDuration(tim);
+	    break;
+
 	case T_At:
 	    DBufFree(&buf);
 	    r=ParseTimeTrig(s, tim, save_in_globals);
@@ -1200,19 +1212,28 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
     /* If "infinite delta" option is chosen, always trigger future reminders */
     if (InfiniteDelta || NextMode) return 1;
 
-    /* If there's a "warn" function, it overrides any deltas */
+    /* If there's a "warn" function, it overrides any deltas except
+     * DeltaOverride*/
     if (t->warn[0] != 0) {
-	if (DeltaOffset) {
-	    if (dse <= DSEToday + DeltaOffset) {
+	if (DeltaOverride > 0) {
+	    if (dse <= DSEToday + DeltaOverride) {
 		return 1;
 	    }
 	}
 	return ShouldTriggerBasedOnWarn(t, dse, err);
     }
 
+    /* Zero delta */
+    if (DeltaOverride < 0) {
+        return dse == DSEToday;
+    }
+
     /* Move back by delta days, if any */
-    if (t->delta != NO_DELTA) {
-	if (t->delta < 0)
+    if (DeltaOverride) {
+        /* A positive DeltaOverride takes precedence over everything */
+        dse = dse - DeltaOverride;
+    } else if (t->delta != NO_DELTA) {
+        if (t->delta < 0)
 	    dse = dse + t->delta;
 	else {
 	    int iter = 0;
@@ -1237,7 +1258,7 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int dse, int *err)
     }
 
     /* Should we trigger the reminder? */
-    return (dse <= DSEToday + DeltaOffset);
+    return (dse <= DSEToday);
 }
 
 /***************************************************************/

src/funcs.c

@@ -3290,6 +3290,8 @@ FSlide(func_info *info)
 {
     int r, omit, d, i, localomit, amt;
     Token tok;
+    int step = 1;
+    int localargs = 2;
 
     if (!HASDATE(ARG(0))) return E_BAD_TYPE;
     ASSERT_TYPE(1, INT_TYPE);
@@ -3299,8 +3301,13 @@ FSlide(func_info *info)
     if (amt > 1000000) return E_2HIGH;
     if (amt < -1000000) return E_2LOW;
 
+    if (Nargs > 2 && ARG(2).type == INT_TYPE) {
+        step = ARGV(2);
+        if (step < 1) return E_2LOW;
+        localargs++;
+    }
     localomit = 0;
-    for (i=2; i<Nargs; i++) {
+    for (i=localargs; i<Nargs; i++) {
 	if (ARG(i).type != STR_TYPE) return E_BAD_TYPE;
 	FindToken(ARG(i).v.str, &tok);
 	if (tok.type != T_WkDay) return E_UNKNOWN_TOKEN;
@@ -3311,14 +3318,14 @@ FSlide(func_info *info)
     if ((WeekdayOmits | localomit) == 0x7F && amt != 0) return E_2MANY_LOCALOMIT;
     if (amt > 0) {
 	while(amt) {
-	    d++;
+	    d += step;
 	    r = IsOmitted(d, localomit, NULL, &omit);
 	    if (r) return r;
 	    if (!omit) amt--;
 	}
     } else {
 	while(amt) {
-	    d--;
+	    d -= step;
 	    if (d < 0) return E_DATE_OVER;
 	    r = IsOmitted(d, localomit, NULL, &omit);
 	    if (r) return r;
@@ -3335,6 +3342,8 @@ FNonomitted(func_info *info)
 {
     int d1, d2, ans, localomit, i;
     int omit, r;
+    int step = 1;
+    int localargs = 2;
     Token tok;
 
     if (!HASDATE(ARG(0)) ||
@@ -3343,10 +3352,20 @@ FNonomitted(func_info *info)
     }
     d1 = DATEPART(ARG(0));
     d2 = DATEPART(ARG(1));
-    if (d2 < d1) return E_2LOW;
+    if (d2 < d1) {
+        i = d1;
+        d1 = d2;
+        d2 = i;
+    }
 
+    /* Check for a "step" argument - it's an INT */
+    if (Nargs > 2 && ARG(2).type == INT_TYPE) {
+        step = ARGV(2);
+        if (step < 1) return E_2LOW;
+        localargs++;
+    }
     localomit = 0;
-    for (i=2; i<Nargs; i++) {
+    for (i=localargs; i<Nargs; i++) {
 	if (ARG(i).type != STR_TYPE) return E_BAD_TYPE;
 	FindToken(ARG(i).v.str, &tok);
 	if (tok.type != T_WkDay) return E_UNKNOWN_TOKEN;
@@ -3355,11 +3374,12 @@ FNonomitted(func_info *info)
 
     ans = 0;
     while (d1 < d2) {
-	r = IsOmitted(d1++, localomit, NULL, &omit);
+	r = IsOmitted(d1, localomit, NULL, &omit);
 	if (r) return r;
 	if (!omit) {
 	    ans++;
 	}
+        d1 += step;
     }
     RetVal.type = INT_TYPE;
     RETVAL = ans;
@@ -3554,6 +3574,8 @@ rows_or_cols(func_info *info, int want_rows)
     struct winsize w;
     int fd = STDOUT_FILENO;
 
+    int opened = 0;
+
     RetVal.type = INT_TYPE;
     if (!isatty(fd)) {
         fd = open("/dev/tty", O_RDONLY);
@@ -3561,6 +3583,7 @@ rows_or_cols(func_info *info, int want_rows)
             RETVAL = -1;
             return OK;
         }
+        opened = 1;
     }
     if (ioctl(fd, TIOCGWINSZ, &w) == 0) {
         if (want_rows) RETVAL = w.ws_row;
@@ -3568,7 +3591,7 @@ rows_or_cols(func_info *info, int want_rows)
     } else {
         RETVAL = -1;
     }
-    if (fd != STDOUT_FILENO) {
+    if (opened) {
         close(fd);
     }
     return OK;
@@ -3737,7 +3760,7 @@ solstice_equinox_for_year(int y, int which)
     j -= 2447892.50000;  /* This is the Julian date of midnight, 1 Jan 1990 UTC */
     int dse = (int) j;
 
-    int min = floor((j - (double) dse) * MINUTES_PER_DAY);
+    int min = (int) floor((j - (double) dse) * MINUTES_PER_DAY);
     int ret;
 
     /* Convert from UTC to local time */
@@ -3785,8 +3808,10 @@ FSoleq(func_info *info)
     }
 
     ret = solstice_equinox_for_year(y, which);
+    if (ret < 0) return E_MKTIME_PROBLEM;
     if (dse != NO_DATE && (ret / MINUTES_PER_DAY) < dse) {
         ret = solstice_equinox_for_year(y+1, which);
+        if (ret < 0) return E_MKTIME_PROBLEM;
     }
     RetVal.type = DATETIME_TYPE;
     RETVAL = ret;

src/globals.h

@@ -70,7 +70,7 @@ EXTERN  INIT(	int 	Hush, 0);
 EXTERN  INIT(	int 	NextMode, 0);
 EXTERN  INIT(	int 	InfiniteDelta, 0);
 EXTERN  INIT(   int     DefaultTDelta, 0);
-EXTERN  INIT(   int     DeltaOffset, 0);
+EXTERN  INIT(   int     DeltaOverride, 0);
 EXTERN  INIT(   int     RunDisabled, 0);
 EXTERN  INIT(   int     IgnoreOnce, 0);
 EXTERN  INIT(   int     SortByTime, 0);
@@ -79,6 +79,7 @@ EXTERN	INIT(	int	SortByPrio, 0);
 EXTERN  INIT(   int     UntimedBeforeTimed, 0);
 EXTERN	INIT(	int	DefaultPrio, NO_PRIORITY);
 EXTERN  INIT(   long    SysTime, -1L);
+EXTERN  INIT(   int     ParseUntriggered, 1);
 
 EXTERN	char	const *InitialFile;
 EXTERN	int	FileAccessDate;

src/init.c

@@ -25,10 +25,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-
+#include <poll.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <termios.h>
 
 #ifdef HAVE_INITGROUPS
 #include <grp.h>
@@ -40,6 +41,14 @@
 #include "expr.h"
 #include "err.h"
 
+static int should_guess_terminal_background = 1;
+
+static void guess_terminal_background(int *r, int *g, int *b);
+static int tty_init(int fd);
+static void tty_raw(int fd);
+static void tty_reset(int fd);
+
+static void ProcessLongOption(char const *arg);
 /***************************************************************
  *
  *  Command line options recognized:
@@ -167,6 +176,7 @@ void InitRemind(int argc, char const *argv[])
     int x;
     int dse;
     int ttyfd;
+    int r, g, b;
 
     dse = NO_DATE;
 
@@ -243,6 +253,11 @@ void InitRemind(int argc, char const *argv[])
                 while(*arg) arg++;
                 break;
 
+            case '-':
+                ProcessLongOption(arg);
+                while(*arg) arg++;
+                break;
+
 	    case '@':
 		UseVTColors = 1;
 		if (*arg) {
@@ -259,16 +274,24 @@ void InitRemind(int argc, char const *argv[])
 		if (*arg == ',') {
 		    arg++;
                     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;
+                        if (*arg == 't') {
+                            arg++;
+                            should_guess_terminal_background = 2;
                         } else {
-                            fprintf(ErrFp, "%s: -@n,m,b: m must be 0, 1 or 2 (assuming 2)\n",
-                                    argv[0]);
+                            PARSENUM(x, arg);
+                            if (x == 0) {
+                                should_guess_terminal_background = 0;
+                                TerminalBackground = TERMINAL_BACKGROUND_DARK;
+                            } else if (x == 1) {
+                                should_guess_terminal_background = 0;
+                                TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+                            } else if (x == 2) {
+                                should_guess_terminal_background = 0;
+                                TerminalBackground = TERMINAL_BACKGROUND_UNKNOWN;
+                            } else {
+                                fprintf(ErrFp, "%s: -@n,m,b: m must be t, 0, 1 or 2 (assuming 2)\n",
+                                        argv[0]);
+                            }
                         }
                     }
 		}
@@ -341,10 +364,15 @@ void InitRemind(int argc, char const *argv[])
                 } else if (!*arg) {
 		    InfiniteDelta = 1;
 		} else {
-		    PARSENUM(DeltaOffset, arg);
-		    if (DeltaOffset < 0) {
-			DeltaOffset = 0;
-		    }
+                    if (*arg == 'z') {
+                        DeltaOverride = -1;
+                        arg++;
+                    } else {
+                        PARSENUM(DeltaOverride, arg);
+                        if (DeltaOverride < 0) {
+                            DeltaOverride = 0;
+                        }
+                    }
 		}
 		break;
 	    case 'e':
@@ -532,7 +560,7 @@ void InitRemind(int argc, char const *argv[])
                         arg++;
                         /* -wt means get width from /dev/tty */
                         ttyfd = open("/dev/tty", O_RDONLY);
-                        if (!ttyfd) {
+                        if (ttyfd < 0) {
                             fprintf(stderr, "%s: `-wt': Cannot open /dev/tty: %s\n",
                                     argv[0], strerror(errno));
                         } else {
@@ -543,7 +571,12 @@ void InitRemind(int argc, char const *argv[])
                         PARSENUM(CalWidth, arg);
                         if (CalWidth != 0 && CalWidth < 71) CalWidth = 71;
                         if (CalWidth == 0) {
-                            CalWidth = -1;
+                            /* Cal width of 0 means obtain from stdout */
+                            if (isatty(STDOUT_FILENO)) {
+                                InitCalWidthAndFormWidth(STDOUT_FILENO);
+                            } else {
+                                CalWidth = 80;
+                            }
                         }
                         FormWidth = CalWidth - 8;
                         if (FormWidth < 20) FormWidth = 20;
@@ -616,6 +649,17 @@ void InitRemind(int argc, char const *argv[])
 	}
     }
 
+    if (should_guess_terminal_background) {
+        guess_terminal_background(&r, &g, &b);
+        if (r >= 0 && g >= 0 && b >= 0) {
+            if (r+g+b <= 85*3 && r <= 128 && g <= 128 && b <= 128) {
+                TerminalBackground = TERMINAL_BACKGROUND_DARK;
+            } else {
+                TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
+            }
+        }
+    }
+
     /* Get the filename. */
     if (!InvokedAsRem) {
 	if (i >= argc) {
@@ -953,3 +997,116 @@ AddTrustedUser(char const *username)
     NumTrustedUsers++;
 }
 
+static void
+ProcessLongOption(char const *arg)
+{
+    if (!strcmp(arg, "version")) {
+        printf("%s\n", VERSION);
+        exit(0);
+    }
+    fprintf(ErrFp, "%s: Unknown long option --%s\n", ArgV[0], arg);
+}
+
+static void
+guess_terminal_background(int *r, int *g, int *b)
+{
+    int ttyfd;
+    struct pollfd p;
+    int rr, gg, bb;
+    char buf[128];
+    int n;
+
+    *r = -1;
+    *g = -1;
+    *b = -1;
+
+    /* Don't guess if stdout not a terminal unless asked to by @,t */
+    if (should_guess_terminal_background != 2) {
+        if (!isatty(STDOUT_FILENO)) {
+            return;
+        }
+    }
+
+    ttyfd = open("/dev/tty", O_RDWR);
+    if (ttyfd < 0) {
+        return;
+    }
+
+    if (!isatty(ttyfd)) {
+        /* Not a TTY: Can't guess the color */
+        close(ttyfd);
+        return;
+    }
+
+    if (!tty_init(ttyfd)) {
+        return;
+    }
+    tty_raw(ttyfd);
+    write(ttyfd, "\033]11;?\033\\", 8);
+
+    /* Wait up to 0.1s for terminal to respond */
+    p.fd = ttyfd;
+    p.events = POLLIN;
+    if (poll(&p, 1, 100) < 0) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    if (!(p.revents & POLLIN)) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    n = read(ttyfd, buf, 127);
+    if (n <= 0) {
+        tty_reset(ttyfd);
+        close(ttyfd);
+        return;
+    }
+    tty_reset(ttyfd);
+    buf[n+1] = 0;
+    if (n < 25) {
+        /* Too short */
+        return;
+    }
+    if (sscanf(buf+5, "rgb:%x/%x/%x", &rr, &gg, &bb) != 3) {
+        /* Couldn't scan color codes */
+        return;
+    }
+    *r = (rr >> 8) & 255;
+    *g = (gg >> 8) & 255;
+    *b = (bb >> 8) & 255;
+}
+
+static struct termios orig_termios;
+
+static int
+tty_init(int fd)
+{
+    if (tcgetattr(fd, &orig_termios) < 0) {
+        return 0;
+    }
+    return 1;
+}
+
+static void
+tty_raw(int fd)
+{
+    struct termios raw;
+
+    raw = orig_termios;
+
+    raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
+    raw.c_oflag &= ~(OPOST);
+    raw.c_cflag |= (CS8);
+    raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG);
+
+    /* put terminal in raw mode after flushing */
+    tcsetattr(fd,TCSAFLUSH,&raw);
+}
+
+static void
+tty_reset(int fd)
+{
+    tcsetattr(fd, TCSAFLUSH, &orig_termios);
+}

src/langs/italian.h

@@ -17,11 +17,11 @@
 
 /* Day names */
 #define L_SUNDAY "Domenica"
-#define L_MONDAY "Lunedí"
-#define L_TUESDAY "Martedí"
-#define L_WEDNESDAY "Mercoledí"
-#define L_THURSDAY "Giovedí"
-#define L_FRIDAY "Venerdí"
+#define L_MONDAY "Lunedì"
+#define L_TUESDAY "Martedì"
+#define L_WEDNESDAY "Mercoledì"
+#define L_THURSDAY "Giovedì"
+#define L_FRIDAY "Venerdì"
 #define L_SATURDAY "Sabato"
 
 /* Month names */
@@ -68,7 +68,7 @@
 #define L_AT "alle"
 #define L_MINUTE "minut"
 #define L_HOUR "or"
-#define L_IS "é"
+#define L_IS "è"
 #define L_WAS "era"
 #define L_AND "e"
 /* What to add to make "hour" plural */

src/main.c

@@ -26,16 +26,10 @@
 #endif
 
 #include <ctype.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+#if defined(HAVE_SYS_TIME_H)
 #include <sys/time.h>
-#else
-#if defined(HAVE_SYS_TIME_H) || defined (TIME_WITH_SYS_TIME)
-#include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include <sys/types.h>
 #ifdef REM_USE_WCHAR

src/var.c

@@ -792,7 +792,7 @@ static SysVar SysVarArr[] = {
     {"DefaultColor",   1,  SPECIAL_TYPE, default_color_func,   0,      0 },
     {"DefaultPrio",    1,  INT_TYPE,     &DefaultPrio,         0,      9999 },
     {"DefaultTDelta",  1,  INT_TYPE,     &DefaultTDelta,       0,      1440 },
-    {"DeltaOffset",    0,  INT_TYPE,     &DeltaOffset,         0,      0 },
+    {"DeltaOverride",  0,  INT_TYPE,     &DeltaOverride,         0,      0 },
     {"DontFork",       0,  INT_TYPE,     &DontFork,            0,      0 },
     {"DontQueue",      0,  INT_TYPE,     &DontQueue,           0,      0 },
     {"DontTrigAts",    0,  INT_TYPE,     &DontIssueAts,        0,      0 },
@@ -839,6 +839,7 @@ static SysVar SysVarArr[] = {
     {"NumTrig",        0,  INT_TYPE,     &NumTriggered,        0,      0 },
     {"October",        1,  STR_TYPE,     &DynamicMonthName[9], 0,      0 },
     {"On",             1,  STR_TYPE,     &DynamicOn,           0,      0 },
+    {"ParseUntriggered", 1, INT_TYPE,    &ParseUntriggered,    0,      1 },
     {"Pm",             1,  STR_TYPE,     &DynamicPm,           0,      0 },
     {"PrefixLineNo",   0,  INT_TYPE,     &DoPrefixLineNo,      0,      0 },
     {"PSCal",          0,  INT_TYPE,     &PsCal,               0,      0 },

tests/test-rem

@@ -408,6 +408,18 @@ TZ=Europe/Berlin ../src/remind -dxe ../tests/tz.rem >> ../tests/test.out 2>&1
 # Test that banner is printed on every iteration
 echo "MSG Should be three banners." | ../src/remind - 2022-10-20 '*3' >> ../tests/test.out 2>&1
 
+# Test the -tn option
+echo "REM May 23 +10 MSG Orange %b" | ../src/remind - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 23 +10 MSG Quux %b" | ../src/remind -t1 - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 23 +10 MSG Cabbage %b" | ../src/remind -t2 - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 23 MSG Banana %b" | ../src/remind - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 23 MSG Carrot %b" | ../src/remind -t1 - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 23 MSG Apple %b" | ../src/remind -t2 - 2023-05-21 >> ../tests/test.out 2>&1
+
+# Test the -tz option
+echo "REM May 22 +10 MSG Foo %b" | ../src/remind - 2023-05-21 >> ../tests/test.out 2>&1
+echo "REM May 22 +10 MSG Bar %b" | ../src/remind -tz - 2023-05-21 >> ../tests/test.out 2>&1
+
 # World-writable file
 rm -rf include_dir/ww
 touch include_dir/ww
@@ -425,6 +437,9 @@ rm -rf include_dir/ww
 # This segfaulted in 04.02.03
 ../src/remind -h '-imsgprefix(x)="foo"' /dev/null >> ../tests/test.out 2>&1
 
+# Test --version long option
+../src/remind --version >> ../tests/test.out 2>&1
+
 # Remove references to SysInclude, which is build-specific
 grep -F -v '$SysInclude' < ../tests/test.out > ../tests/test.out.1 && mv -f ../tests/test.out.1 ../tests/test.out
 cmp -s ../tests/test.out ../tests/test.cmp

tests/test.rem

@@ -482,7 +482,7 @@ msg [$December]%
 msg [$DefaultColor]%
 msg [$DefaultPrio]%
 msg [$DefaultTDelta]%
-msg [$DeltaOffset]%
+msg [$DeltaOverride]%
 msg [$DontFork]%
 msg [$DontQueue]%
 msg [$DontTrigAts]%
@@ -881,6 +881,12 @@ set a htmlstriptags("This is <unclosed whut?")
 set a htmlstriptags("this is > whut <b>foo</b>")
 set a htmlstriptags("<img src=\"foo\">")
 
+# $ParseUntriggered
+REM 2 Jan 1990 MSG ["bad_expr" * 2]
+SET $ParseUntriggered 0
+REM 2 Jan 1990 MSG ["bad_expr" * 2]
+SET $ParseUntriggered 1
+
 # Don't want Remind to queue reminders
 EXIT
 

tests/test2.rem

@@ -26,6 +26,25 @@ REM 12 AUG SPECIAL MOON 0
 # Test nonomitted
 REM MSG [nonomitted('2007-08-01', today())] NonOmit-1
 REM MSG [nonomitted('2007-08-01', today(), "Sat", "Sun")] NonOmit-2
+REM MSG [nonomitted('2007-08-01', '2007-08-30', 7)]
+REM MSG [nonomitted('2007-08-01', '2007-08-29', 7)]
+REM MSG [nonomitted('2007-08-28', '2007-08-01', 7)]
+
+PUSH-OMIT-CONTEXT
+OMIT 2007-08-15
+REM MSG [nonomitted('2007-08-01', '2007-08-30', 7)]
+REM MSG [nonomitted('2007-08-01', '2007-08-29', 7)]
+REM MSG [nonomitted('2007-08-01', '2007-08-28', 7)]
+POP-OMIT-CONTEXT
+
+# Test slide
+REM MSG [slide('2007-08-03', 4)]
+REM MSG [slide('2007-08-03', 4, 7)]
+
+PUSH-OMIT-CONTEXT
+OMIT 2007-08-17
+REM MSG [slide('2007-08-03', 4, 7)]
+POP-OMIT-CONTEXT
 
 # Test SPECIAL COLOR with an AT clause
 REM 20 AUG AT 13:45 SPECIAL COLOR 6 7 8 Mooo!