Revert "Guess terminal background even if stdout is not a tty"

This reverts commit 887cd83ebe.
Guess terminal background even if stdout is not a tty
2026-04-16 06:18:47 +02:00 · 2023-10-04 09:36:25 -04:00 · 2023-10-04 09:33:54 -04:00 · 2023-10-04 09:32:44 -04:00 · 2023-10-04 09:32:38 -04:00 · 2023-10-04 09:32:06 -04:00
43 changed files with 4471 additions and 2292 deletions
--- a/2987
+++ b/2987
--- a/configure.in
+++ b/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
@@ -35,14 +36,14 @@ AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)

 dnl Checks for header files.
-AC_CHECK_HEADERS(sys/types.h sys/file.h glob.h wctype.h locale.h langinfo.h)
+AC_CHECK_HEADERS(sys/types.h glob.h wctype.h locale.h langinfo.h)

 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_STRUCT_TM

 dnl Checks for library functions.
 AC_FUNC_UTIME_NULL
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])

 if test "$GCC" = yes; then
 	CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes"
@@ -80,10 +81,11 @@ if test "$?" != 0 ; then
    exit 1
 fi
 AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups)
-VERSION=04.02.02
+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
--- a/contrib/remind-conf-mode/remind-conf-mode.el
+++ b/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)
--- a/docs/WHATSNEW
+++ b/docs/WHATSNEW
@@ -1,6 +1,118 @@
 CHANGES TO REMIND

-* VERSION 4.2 Patch 3 - 2023-??-??
+* VERSION 4.2 Patch 7 - 2023-XX-XX
+
+- MINOR NEW FEATURE: remind: Attempt to obtain the terminal background
+  color using an OSC sequence.
+
+- 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
+  give a better error message suggesting THROUGH instead of UNTIL.
+
+- BUG FIX: remind: The fix for the combination of ADDOMIT and SATISFY that
+  appeared in version 04.02.00 was not complete; the bug has finally been
+  properly fixed.
+
+- BUG FIX: remind: Remove an unnecessary #include <sys/file.h>.
+  Nothing needed that and it broke compilation on FreeBSD.
+
+* VERSION 4.2 Patch 4 - 2023-03-15
+
+- NEW FEATURE: Remind: Add "htmlescape" and "htmlstriptags" built-in
+  functions.
+
+- NEW FEATURE: Rem2PDF: Add the "--wrap, -y" option to ensure that no
+  printed calendar takes up more than 5 rows.  If a calendar would normally
+  require 6 rows, wrap it so the last day or two appear on the first
+  row instead of on a sixth row.
+
+- NEW FEATURE: Remind: Improve the -k option to allow specification of
+  separate commands for immediately-issued vs. queued reminders.  For
+  example:
+
+     remind '-kcmd1 %s' '-k:cmd2 %s' ...
+
+  will use "cmd1" for immediately-issued reminders and "cmd2" for queued
+  ones.  If you only use '-k:cmd2 %s' then immediately-issued reminders
+  are simply printed as usual rather than being passed to a command.
+
+- IMPROVEMENT: Remind:  Make "SPECIAL MSG" the same as just "MSG" and
+  the same for MSF, RUN, PS and PSFILE.  This effectively lets you use
+  expression-pasting to determine the type of a REM command; see the
+  remind(1) man page for details.
+
+- MINOR IMPROVEMENT: If "make test" fails, output up to 200 lines of diff
+  so we can see immediately what failed.
+
+- DOCUMENTATION FIX: Fix some typos; fix TkRemind syntax description.
+
+- TEST FIX: Make tests run reliably regardless of local machine's time zone.
+
+- BUG FIX: TkRemind: Don't crash if local installation of Tk lacks the
+  -underlinefg configuration option.
+
+- BUG FIX: examples/defs.rem: Fix up US Thanksgiving example.
+
+- BUG FIX: include/holidays/us.rem: Add logic for US holidays that are
+  observed on a Friday if the holiday is a Saturday, or on a Monday if the
+  holiday is a Sunday.
+
+- BUG FIX: TkRemind: Don't cut off MOON text at the first white-space
+  character.
+
+- BUG FIX: Remind: prevent functions defined on the command-line (as in
+  remind '-if(x)=whatever') from segfaulting.
+
+* VERSION 4.2 Patch 3 - 2023-02-10

 - NEW FEATURE: Remind: add the orthodoxeaster() function to return the
  date of Orthodox Easter.
@@ -9,8 +121,25 @@ CHANGES TO REMIND

 - IMPROVEMENT: Add Greek holiday file courtesy of JeiEl.

+- IMPROVEMENT: Fix the Perl code (rem2pdf, rem2html) to silence Perl::Critic
+  warnings
+
+- 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.
+  Tavis Ormandy and Tim Chase.  Also fixed in include/holidays/us.rem
+
+- BUG FIX: Remind: Add missing #include <fcntl.h> to funcs.c
+
+- BUG FIX: Remind: Fix undefined integer-overflow behavior in built-in abs()
+  function.  Pointed out on IRC by "ubitux".

 * VERSION 4.2 Patch 2 - 2023-01-01

--- a/examples/astro
+++ b/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 %

--- a/examples/defs.rem
+++ b/examples/defs.rem
@@ -42,7 +42,6 @@ SET  Week_1		 1
 SET  Week_2		 8
 SET  Week_3		15
 SET  Week_4		22
-FSET _last(mo)		"1 " + MON((mo%12)+1) + " --7"

 #################################################################
 # Function that removes a single leading zero from a string...  #
@@ -126,6 +125,8 @@ REM Sat Sun SPECIAL SHADE 220
 # The following holidays were provided by Dave Rickel			    #
 # Modified by D. Skoll to give safe OMITs for moveable holidays		    #
 #									    #
+# NOTE: See include/holidays/us.rem for more up-to-date definitions         #
+#									    #
 #############################################################################

 SET SaveTrig $NumTrig
@@ -189,7 +190,7 @@ 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 Last Thu in Nov 	SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
+REM Thu Nov [Week_4]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving Day%"
 REM Fri Nov [Week_4+1]	SCANFROM -7 ADDOMIT MSG %"Thanksgiving (cont.)%"
 OMIT    Dec 24		MSG %"Christmas Eve%"
 OMIT    Dec 25		MSG %"Christmas%" Day
--- a/include/holidays/ie.rem
+++ b/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
--- a/include/holidays/us.rem
+++ b/include/holidays/us.rem
@@ -14,6 +14,9 @@ REM  [easterdate($Uy)+49] MSG Pentecost
 # which ones are omitted.

 OMIT Jan 1 MSG New Year's Day
+REM 31 Dec SCANFROM -7 ADDOMIT SATISFY [$Tw==5] MSG New Year's Day (observed)
+REM 2 Jan SCANFROM -7 ADDOMIT SATISFY [$Tw==1] MSG New Year's Day (observed)
+
 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
@@ -21,11 +24,27 @@ 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 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
-REM Mon Tue Wed Thu Fri Sat 15 Apr MSG %"Income tax%" due
+
+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
@@ -33,14 +52,21 @@ 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

+OMIT 19 June MSG Juneteenth
+REM 18 June SCANFROM -7 ADDOMIT SATISFY [$Tw==5] MSG Juneteenth (observed)
+REM 20 June SCANFROM -7 ADDOMIT SATISFY [$Tw==1] MSG Juneteenth (observed)
+
 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 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
+
+OMIT 11 Nov MSG Veterans Day
+REM 10 Nov SCANFROM -7 ADDOMIT SATISFY [$Tw==5] MSG Veterans Day (observed)
+REM 12 Nov SCANFROM -7 ADDOMIT SATISFY [$Tw==1] MSG Veterans Day (observed)

 REM Oct 30 MSG Mischief Night
 REM Oct 31 MSG Halloween
@@ -48,8 +74,9 @@ 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
+REM 24 Dec SCANFROM -7 ADDOMIT SATISFY [$Tw==5] MSG Christmas (observed)
+REM 26 Dec SCANFROM -7 ADDOMIT SATISFY [$Tw==1] MSG Christmas (observed)
--- a/include/lang/it.rem
+++ b/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"
--- a/man/rem.1.in
+++ b/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)
--- a/man/remind.1.in
+++ b/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 themseves are removed.)
 .TP
 .B 'l'
 causes \fBRemind\fR to use VT100 line-drawing characters to draw
@@ -103,11 +109,15 @@ 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.
+.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.
 .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 +232,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, regardles 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
@@ -328,6 +344,18 @@ processes with the above technique.  So be very careful.  Because all
 shell and whitespace characters are escaped, the program you execute
 with the \fB\-k\fR option must be prepared to handle the entire
 message as a single argument.
+.PP
+If you follow the \fB\-k\fR option with a colon, then the command is applied
+only to queued timed reminders.  Normal reminders are handled as usual.
+In the above example, if you want normal reminders to simply be displayed
+as usual, but queued reminders to be sent to notify-send, you could use:
+.PP
+.nf
+		remind '\-k:notify-send %s &' ...
+.fi
+.PP
+You use both \fB\-k\fR\fIcmd1\fR and \fB\-k:\fR\fIcmd2\fR to use different
+commands for queued versus non-queued reminders.
 .RE
 .TP
 \fB\-z\fR[\fIn\fR] Runs \fBRemind\fR in the daemon mode.  If \fIn\fR
@@ -590,6 +618,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
@@ -1006,7 +1039,7 @@ By comparison, if we had used "\-\-1", the reminder would be triggered on
 the last day of the month, regardless of the \fBOMIT\fR.
 .PP
 If you locally omit weekdays but also have globally-omitted weekdays, then
-the list of ommitted weekdays is the union of the two.  Consider this
+the list of omitted weekdays is the union of the two.  Consider this
 example:
 .PP
 .nf
@@ -1215,11 +1248,25 @@ specifies the duration of an event.  For example, if you have a
 	REM 5 March 2021 AT 1:00pm DURATION 90 MSG Meeting
 .fi
 .PP
-
-Note that \fIduration\fR is specified either in hours and minutes as a
-\fItime\fR, or in minutes as an \fIinteger\fR.  If you specify a
-duration of 00:00 or 0, then \fBRemind\fR behaves exactly as if no
-\fBDURATION\fR at all had been present.
+For long-duration reminders, it is convenient to use expressions
+to simplify writing the DURATION.  For example, if you are away
+from 20 Feb 2023 through 23 Feb 2023 (a total of 4 days) you
+could write:
+.PP
+.nf
+        REM 20 Feb AT 00:00 DURATION [4*24]:00 MSG away
+        REM 20 Feb AT 00:00 DURATION [4*24*60] MSG away
+.fi
+.PP
+Note that \fIduration\fR is specified either as
+\fIhours\fR:\fIminutes\fR or just as \fIminutes\fR specified as an
+\fIinteger\fR.
+.PP
+If you specify a duration of 00:00 or 0, then \fBRemind\fR behaves
+exactly as if no \fBDURATION\fR at all had been present.  Although
+durations specified as \fIhours\fR:\fIminutes\fR look superficially like a
+time-of-day, they are not; the \fIhours\fR component is not limited
+to the range 00-23.

 .PP
 .SH SYNTACTIC SUGAR FOR REM
@@ -1961,9 +2008,23 @@ somewhat comparable to a C character array, but more closely resembles
 the string type in BASIC.
 .TP
 .B TIME
-The \fBTIME\fR data type consists of times of the day.  The \fBTIME\fR
-data type is internally stored as an integer representing the number
-of minutes since midnight.
+The \fBTIME\fR data type is used for two different purposes:  To represent
+a time of day with one-minute precision or to represent a duration
+with one-minute precision.  The context of where a \fBTIME\fR is used
+determines whether it is interpreted as a time of day or a duration.
+.RS
+.PP
+In contexts where a \fBTIME\fR represents a time of day, it may range
+from 00:00 to 23:59 and is stored internally as an integer from 0 to
+1439 representing the number of minutes since midnight.
+.PP
+In contexts where a \fBTIME\fR represents a duration, there is no
+upper limit on the hour component (beyond that imposed by the
+restriction that a duration expressed in minutes must fit into the
+signed integer type of your CPU architecture.)  Internally, a duration
+is stored as an integer number of minutes.
+.RE
+
 .TP
 .B DATE
 The \fBDATE\fR data type consists of dates (later than 1 January 1990.)
@@ -2006,6 +2067,15 @@ range from 1 to 12.  Either a period or colon can be used to separate
 the minutes from the hours.  However, Remind will consistently output
 times in 24-hour format using only one separator character.  (The
 output separator character is chosen at compile-time.)
+.PP
+If the \fBTIME\fR is used where \fBRemind\fR expects a time-of-day
+(for example, in an \fBAT\fR clause), then it can be written in
+24-hour format (ranging from 00:00 to 23:59) or 12-hour format
+(ranging from 12:00am to 11:59pm).  If the \fBTIME\fR is used where
+\fBRemind\fR expects a duration, it must not have an \fIam\fR or
+\fIpm\fR suffix and the hour can be as large as you want, so long
+as the total number of minutes in the duration fits in a signed integer
+variable.
 .RE
 .TP
 .B DATE constants
@@ -2341,6 +2411,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
@@ -2407,7 +2481,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
@@ -2528,6 +2603,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
@@ -2629,9 +2726,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,
@@ -3037,6 +3138,16 @@ Support for Hebrew dates - see the section "THE HEBREW CALENDAR"
 .B hour(tq_time)
 Returns the hour component of \fItime\fR.
 .TP
+.B htmlescape(s_str)
+Returns a modified copy of \fIstr\fR where "<" is replaced with
+"&lt;"; ">" is replaced with "&gt;" and "&" is replaced with "&amp;"
+.TP
+.B htmlstriptags(s_str)
+Returns a modified copy of \fIstr\fR where HTML tags are stripped
+out.  The stripping algorithm is fairly naive; the function starts
+stripping characters when it encounters a "<" and it stops stripping
+when it encounters a ">".
+.TP
 .B iif(si_test1, x_arg1, [si_test2, x_arg2,...], x_default)
 If \fItest1\fR is not zero or the null string, returns \fIarg1\fR.
 Otherwise, if \fItest2\fR is not zero or the null string, returns
@@ -3199,14 +3310,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.
@@ -3427,10 +3555,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:
@@ -3450,6 +3581,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])
@@ -4028,15 +4179,30 @@ You cannot use expression-pasting to determine the type (\fBMSG\fR,
 \fBCAL\fR, etc.) of a \fBREM\fR command.  You can paste expressions
 before and after the \fBMSG\fR, etc. keywords, but cannot do something like
 this:
+.RS
 .PP
 .nf
-		REM ["12 Nov 1993 AT 13:05 " + "MSG" + " BOO!"]
+        REM ["12 Nov 1993 AT 13:05 " + "MSG" + " BOO!"]
 .fi
 .PP
-.B COMMON PITFALLS IN EXPRESSION PASTING
+However, as an escape hatch, the sequence \fBSPECIAL\fR \fItype\fR
+means the same thing as just \fItype\fR where \fItype\fR is one
+of MSG, MSF, RUN, CAL, PS and PSFILE.  This lets you do something
+like this:
 .PP
-Remember, when pasting in expressions, that extra spaces are not
-inserted.  Thus, something like:
+.nf
+        SET type "MSG"
+        REM 12 Nov 2024 SPECIAL [type] Hello
+.fi
+.PP
+You can use this to control the types of your reminders based on variables
+you set, how Remind is invoked, etc.
+.RE
+.PP
+.B COMMON PITFALLS WITH EXPRESSION PASTING
+.PP
+Remember that extra spaces are not inserted when an expression is
+pasted.  Thus, something like:
 .PP
 .nf
 	REM[expr]MSG[expr]
@@ -4142,7 +4308,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:
@@ -4157,6 +4323,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 Tiananmen Square massacre
+.fi
+.PP
 Notes:
 .TP
 o
@@ -5464,7 +5636,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
@@ -5491,6 +5663,9 @@ o
 \fBINCLUDE\fR --> \fBINC\fR
 .TP
 o
+\fBMAYBE-UNCOMPUTABLE\fR --> \fBMAYBE\fR
+.TP
+o
 \fBSCANFROM\fR --> \fBSCAN\fR
 .PP
 .B NIFTY EXAMPLES
@@ -5663,6 +5838,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
@@ -5713,6 +5907,8 @@ Rafa Couto
 Bj\(:orn Dav\('i\[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.
@@ -5735,6 +5931,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)
--- a/man/tkremind.1.in
+++ b/man/tkremind.1.in
@@ -3,7 +3,7 @@
 .SH NAME
 tkremind \- graphical front-end to Remind calendar program
 .SH SYNOPSIS
-.B tkremind \fR[\fIoptions\fR] [\fIread_file\fR] [\fIwrite_file\fR] [\fIconfig_file\fR]
+.B tkremind \fR[\fIoptions\fR] [\fIread_file\fR [\fIwrite_file\fR [\fIconfig_file\fR]]]
 .SH DESCRIPTION
 \fBTkRemind\fR is a graphical front-end to the \fBRemind\fR program.
 It provides a friendly graphical interface which allows you to view
--- a/rem2html/rem2html
+++ b/rem2html/rem2html
@@ -687,7 +687,7 @@ if ($Options{help}) {
    exit(0);
 }

-if (-t STDIN) {
+if (-t STDIN) { ## no critic
    print STDERR "$TIDY_PROGNAME: Input should not come from a terminal.\n\n";
    usage(1);
 }
--- a/rem2pdf/bin/rem2pdf.in
+++ b/rem2pdf/bin/rem2pdf.in
@@ -37,7 +37,7 @@ my $settings = {
        numbers_on_left => 0,
        small_calendars => 0,
        fill_entire_page => 0,
-
+        wrap_calendar => 0,
        media => 'Letter',
        width => 0,
        height => 0,
@@ -86,6 +86,7 @@ Options:
 --media=MEDIA, -mMEDIA  Size for specified media
 --width=W, -wW          Specify media width in 1/72nds of an inch
 --height=H, -hH         Specify media height in 1/72nds of an inch
+--wrap, -y              Make calendar fit in at most 5 rows
 --title-font=FONT       Specify font for calendar title
 --header-font=FONT      Specify font for weekday names
 --daynum-font=FONT      Specify font for day numbers
@@ -114,6 +115,7 @@ my $ret = GetOptions('landscape|l' =>        \$settings->{landscape},
                     'fill-page|e' =>        \$settings->{fill_entire_page},
                     'media|m=s' =>          \$settings->{media},
                     'width|w=i' =>          \$settings->{width},
+                     'wrap|y'    =>          \$settings->{wrap_calendar},
                     'height|h=i' =>         \$settings->{height},
                     'title-font=s' =>       \$settings->{title_font},
                     'header-font=s' =>      \$settings->{header_font},
@@ -175,7 +177,7 @@ if ($settings->{landscape}) {
 }

 # Don't read from a terminal
-if (-t STDIN) {
+if (-t STDIN) { ## no critic
        print STDERR "I can't read data from a terminal.  Please run like this:\n";
        print STDERR "  remind -pp [options] filename | $me [options] > out.pdf\n";
        exit(1);
@@ -249,20 +251,21 @@ sub set_media
 sub set_media_from_file
 {
        my ($fn) = @_;
-        if (!open(IN, '<', $fn)) {
+        my $IN;
+        if (!open($IN, '<', $fn)) {
                return 0;
        }
-        while(<IN>) {
+        while(<$IN>) {
                chomp;
                s/^\s+//;
                s/\s+$//;
                next if ($_ eq '');
                next if ($_ =~ /^#/);
                my $m = $_;
-                close(IN);
+                close($IN);
                return set_media($m);
        }
-        close(IN);
+        close($IN);
        return 0;
 }

@@ -430,6 +433,14 @@ The default is 36.
 The size of the margin at the right of the page in 1/72ths of an inch.
 The default is 36.

+=item --wrap, -y
+
+Modify the calendar so that if it would normally require 6 rows to print,
+then the last day (or last two days, as needed) are moved to the
+first row of the calendar, and adjust the small calendar positions
+as needed.  This results in a calendar that only requires 5 rows, but
+with the last day or two appearing in the I<first> row.
+
 =item --verbose, -v

 Print (on STDERR) the name of the month and year for each month that
--- a/rem2pdf/lib/Remind/PDF.pm
+++ b/rem2pdf/lib/Remind/PDF.pm
@@ -110,7 +110,6 @@ sub read_one_month
        $self->{daysinnextmonth} = 0;
        $self->{prevmonthyear} = 0;
        $self->{nextmonthyear} = 0;
-
        for (my $i=0; $i<=31; $i++) {
                $self->{entries}->[$i] = [];
        }
@@ -134,7 +133,7 @@ sub read_one_month
        $line = $in->getline();
        chomp($line);
        if ($line =~ /^\S+ \S+ \S+ \S+ \S+ \S+ \S+$/) {
-                @{$self->{daynames}} = map { s/_/ /g; $_; } (split(/ /, $line));
+                @{$self->{daynames}} = map { s/_/ /g; $_; } (split(/ /, $line)); ## no critic
        } else {
                return (undef, "Cannot interpret line: $line");
        }
@@ -213,7 +212,7 @@ hash keys found in the newer "remind -pp" JSON output.
 sub parse_oldstyle_line
 {
        my ($self, $line) = @_;
-        return undef unless $line =~ m|^(\d+)/(\d+)/(\d+) (\S+) (\S+) (\S+) (\S+) (.*)$|;
+        return unless $line =~ m|^(\d+)/(\d+)/(\d+) (\S+) (\S+) (\S+) (\S+) (.*)$|;

        my $hash = {
                date => "$1-$2-$3",
@@ -244,6 +243,143 @@ sub parse_oldstyle_line
        return $hash;
 }

+=head2 setup_daymap
+
+Set up the array that maps ($row, $col) to day number (or -1
+for rows/cols out of range.)
+
+=cut
+sub setup_daymap
+{
+        my ($self, $settings) = @_;
+        # First column
+        my $first_col = $self->{firstwkday};
+        if ($self->{mondayfirst}) {
+                $first_col--;
+                if ($first_col < 0) {
+                        $first_col = 6;
+                }
+        }
+
+        # Last column
+        my $last_col = ($first_col + $self->{daysinmonth} - 1) % 7;
+
+        # Number of rows
+        my $rows = 1;
+        my $last_day_on_row = 7 - $first_col;
+        while ($last_day_on_row < $self->{daysinmonth}) {
+                $last_day_on_row += 7;
+                $rows++;
+        }
+
+        # Add a row for small calendars if necessary
+        if (($settings->{small_calendars} != 0) && ($first_col == 0) && ($last_col == 6)) {
+                $rows++;
+                $self->{extra_row} = 1;
+        } else {
+                $self->{extra_row} = 0;
+        }
+        $self->{rows} = $rows;
+        $self->{daymap} = [];
+        $self->{first_col} = $first_col;
+        $self->{last_col} = $last_col;
+        for (my $row=0; $row<$rows; $row++) {
+                for (my $col=0; $col < 7; $col++) {
+                        $self->{daymap}->[$row]->[$col] = -1;
+                }
+        }
+        $self->{nextcal_row} = -1;
+        $self->{prevcal_row} = -1;
+        $self->{nextcal_col} = 6;
+        $self->{prevcal_col} = 0;
+        # Figure out where to draw the small calendars
+        my $extra_row = $self->{extra_row};
+        if ($settings->{small_calendars} == 1) {
+                if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
+                        $self->{prevcal_row} = $rows-1;
+                        $self->{prevcal_col} = 5;
+                        $self->{nextcal_row} = $rows-1;
+                        $self->{nextcal_col} = 6;
+                } else {
+                        $self->{prevcal_row} = 0;
+                        $self->{prevcal_col} = 0;
+                        $self->{nextcal_row} = 0;
+                        $self->{nextcal_col} = 1;
+                }
+        } elsif ($settings->{small_calendars} == 2) {
+                if ($first_col >= 2) {
+                        $self->{prevcal_row} = 0;
+                        $self->{prevcal_col} = 0;
+                        $self->{nextcal_row} = 0;
+                        $self->{nextcal_col} = 1;
+                } else {
+                        $self->{prevcal_row} = $rows-1;
+                        $self->{prevcal_col} = 5;
+                        $self->{nextcal_row} = $rows-1;
+                        $self->{nextcal_col} = 6;
+                }
+        } elsif ($settings->{small_calendars} == 3) {
+                if ($first_col >= 1 && $last_col <= 5) {
+                        $self->{prevcal_row} = 0;
+                        $self->{prevcal_col} = 0;
+                        $self->{nextcal_row} = $rows-1;
+                        $self->{nextcal_col} = 6;
+                } else {
+                        if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
+                                $self->{prevcal_row} = $rows-1;
+                                $self->{prevcal_col} = 5;
+                                $self->{nextcal_row} = $rows-1;
+                                $self->{nextcal_col} = 6;
+                        } else {
+                                $self->{prevcal_row} = 0;
+                                $self->{prevcal_col} = 0;
+                                $self->{nextcal_row} = 0;
+                                $self->{nextcal_col} = 1;
+                        }
+                }
+        }
+
+        my $col = $first_col;
+        my $row = 0;
+        my $day = 1;
+        while ($day <= $self->{daysinmonth}) {
+                $self->{daymap}->[$row]->[$col] = $day;
+                $day++;
+                $col++;
+                if ($col > 6) {
+                        $row++;
+                        $col = 0;
+                }
+        }
+
+        # Check if we should wrap the calendar
+        if ($self->{rows} == 6 && $settings->{wrap_calendar}) {
+                # Move everything in the last row to the first row
+                my $occupied_col = 0;
+                for (my $col=0; $col<7; $col++) {
+                        if ($self->{daymap}->[5]->[$col] > 0) {
+                                $self->{daymap}->[0]->[$col] = $self->{daymap}->[5]->[$col];
+                                $occupied_col = $col;
+                        } else {
+                                last;
+                        }
+                }
+                if ($settings->{small_calendars}) {
+                        $self->{prevcal_row} = 0;
+                        $self->{prevcal_col} = $occupied_col+1;
+                        $self->{nextcal_row} = 0;
+                        $self->{nextcal_col} = $occupied_col+2;
+                        for (my $col = 6; $col > 0; $col--) {
+                                if ($self->{daymap}->[0]->[$col] < 0) {
+                                        $self->{nextcal_col} = $col;
+                                        last;
+                                }
+                        }
+                }
+                $self->{rows} = 5;
+        }
+}
+
 =head2 read_one_month_pp($in, $specials_accepted)

 This function reads one month's worth of data from the file handle
@@ -329,6 +465,7 @@ sub render
 {
        my ($self, $cr, $settings) = @_;

+        $self->setup_daymap($settings);
        $self->{horiz_lines} = [];
        $cr->set_line_cap('square');
        my $so_far = $self->draw_title($cr, $settings);
@@ -347,111 +484,25 @@ sub render
        $self->{remaining_space} = $settings->{height} - $settings->{margin_bottom} - $so_far;

        $self->{minimum_row_height} = $self->{remaining_space} / 9;
-        # First column
-        my $first_col = $self->{firstwkday};
-        if ($self->{mondayfirst}) {
-                $first_col--;
-                if ($first_col < 0) {
-                        $first_col = 6;
-                }
-        }
-
-        # Last column
-        my $last_col = ($first_col + $self->{daysinmonth} - 1) % 7;
-
-        # Number of rows
-        my $rows = 1;
-        my $last_day_on_row = 7 - $first_col;
-        while ($last_day_on_row < $self->{daysinmonth}) {
-                $last_day_on_row += 7;
-                $rows++;
-        }
-
-        my $extra_row = 0;
-        # Add a row for small calendars if necessary
-        if (($settings->{small_calendars} != 0) && ($first_col == 0) && ($last_col == 6)) {
-                $rows++;
-                $extra_row++;
-        }
-
-        # Figure out where to draw the small calendars
-        my $prevcal_top = 0;
-        my $nextcal_top = 0;
-        my $prevcal_bottom = 0;
-        my $nextcal_bottom = 0;
-
-        if ($settings->{small_calendars} == 1) {
-                if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
-                        $prevcal_bottom = 1;
-                        $nextcal_bottom = 1;
-                } else {
-                        $prevcal_top = 1;
-                        $nextcal_top = 1;
-                }
-        } elsif ($settings->{small_calendars} == 2) {
-                if ($first_col >= 2) {
-                        $prevcal_top = 1;
-                        $nextcal_top = 1;
-                } else {
-                        $prevcal_bottom = 1;
-                        $nextcal_bottom = 1;
-                }
-        } elsif ($settings->{small_calendars} == 3) {
-                if ($first_col >= 1 && $last_col <= 5) {
-                        $prevcal_top = 1;
-                        $nextcal_bottom = 1;
-                } else {
-                        if ($last_col <= 4 || ($last_col == 6 && $extra_row)) {
-                                $prevcal_bottom = 1;
-                                $nextcal_bottom = 1;
-                        } else {
-                                $prevcal_top = 1;
-                                $nextcal_top = 1;
-                        }
-                }
-        }

        # Row height if we are filling the page
-        $self->{row_height} = $self->{remaining_space} / $rows;
+        $self->{row_height} = $self->{remaining_space} / $self->{rows};

-        my ($start_col, $start_day);
-        for (my $row = 0; $row < $rows; $row++) {
-                if ($row == 0) {
-                        $start_day = 1;
-                        $start_col = $first_col;
-                } else {
-                        $start_col = 0;
-                }
+        for (my $row = 0; $row < $self->{rows}; $row++) {
                my $old_so_far = $so_far;
-                $so_far = $self->draw_row($cr, $settings, $so_far, $row, $start_day, $start_col);
-                $start_day += 7 - $start_col;
+                $so_far = $self->draw_row($cr, $settings, $so_far, $row);
                push(@{$self->{horiz_lines}}, $so_far);
-                if ($row == 0) {
-                        if ($prevcal_top) {
-                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 0, $so_far - $old_so_far, $settings);
-                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
-                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
-                                                           $settings, $self->{prevmonthname}, $self->{daysinprevmonth}, ($first_col + 35 - $self->{daysinprevmonth}) % 7);
-                        }
-                        if ($nextcal_top) {
-                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 1, $so_far - $old_so_far, $settings);
-                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
-                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
-                                                           $settings, $self->{nextmonthname}, $self->{daysinnextmonth}, ($last_col + 1) % 7);
-                        }
-                } elsif ($row == $rows-1) {
-                        if ($prevcal_bottom) {
-                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 5, $so_far - $old_so_far, $settings);
-                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
-                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
-                                                           $settings, $self->{prevmonthname}, $self->{daysinprevmonth}, ($first_col + 35 - $self->{daysinprevmonth}) % 7);
-                        }
-                        if ($nextcal_bottom) {
-                                my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, 6, $so_far - $old_so_far, $settings);
-                                $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
-                                                           $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
-                                                           $settings, $self->{nextmonthname}, $self->{daysinnextmonth}, ($last_col + 1) % 7);
-                        }
+                if ($row == $self->{prevcal_row}) {
+                        my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, $self->{prevcal_col}, $so_far - $old_so_far, $settings);
+                        $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                   $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                   $settings, $self->{prevmonthname}, $self->{daysinprevmonth}, ($self->{first_col} + 35 - $self->{daysinprevmonth}) % 7);
+                }
+                if ($row == $self->{nextcal_row}) {
+                        my ($x1, $y1, $x2, $y2) = $self->col_box_coordinates($old_so_far, $self->{nextcal_col}, $so_far - $old_so_far, $settings);
+                        $self->draw_small_calendar($cr, $x1 + $settings->{border_size}, $y1 + $settings->{border_size},
+                                                   $x2 - $x1 - 2*$settings->{border_size}, $y2 - $y1 - 2*$settings->{border_size},
+                                                   $settings, $self->{nextmonthname}, $self->{daysinnextmonth}, ($self->{last_col} + 1) % 7);
                }
        }

@@ -495,23 +546,18 @@ calendar row.
 =cut
 sub draw_row
 {
-        my ($self, $cr, $settings, $so_far, $row, $start_day, $start_col) = @_;
+        my ($self, $cr, $settings, $so_far, $row) = @_;

-        my $col = $start_col;
-        my $day = $start_day;
        my $height = 0;

        # Preview them to figure out the row height...
        if (!$settings->{fill_entire_page}) {
-                while ($col < 7) {
+                for (my $col=0; $col<7; $col++) {
+                        my $day = $self->{daymap}->[$row]->[$col];
+                        next if ($day < 1);
                        my $h = $self->draw_day($cr, $settings, $so_far, $day, $col, 0);
                        $height = $h if ($h > $height);
-                        $day++;
-                        $col++;
-                        last if ($day > $self->{daysinmonth});
                }
-                $col = $start_col;
-                $day = $start_day;
        } else {
                $height = $self->{row_height} - $settings->{border_size} * 2;
        }
@@ -520,10 +566,10 @@ sub draw_row
                $height = $self->{minimum_row_height};
        }
        # Now draw for real
-        while ($col < 7 && $day <= $self->{daysinmonth}) {
+        for (my $col=0; $col<7; $col++) {
+                my $day = $self->{daymap}->[$row]->[$col];
+                next if ($day < 1);
                $self->draw_day($cr, $settings, $so_far, $day, $col, $height);
-                $day++;
-                $col++;
        }

        return $so_far + $height + $settings->{border_size};
@@ -908,7 +954,7 @@ sub create_from_stream
        return(undef, 'Unable to parse JSON stream');
 }

-=head2 Remind::PDF::Multi->create_from_stream($json, $specials_accepted)
+=head2 Remind::PDF::Multi->create_from_json($json, $specials_accepted)

 This method takes data from a JSON string <$json>.  C<$specials_accepted>
 is a hashref of SPECIAL reminder types to accept; the key is the name of the
--- a/scripts/tkremind
+++ b/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=    }
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABbCAYAAADDeIOGAAAACXBIWXMAAAu6AAALugFBTNueAAAA
+GXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAADANJREFUeJzdnGtsFNcVx38Xr19r
+4/BawjPGjcGY2MY8Q+1g05iXKwoihvAQoCJEQoiU0CofWgmpUhIJNVKpSGnUSGmKLEEihcZFQeBW
+gRJeKQkQisFAsWDxGsdAawjgGGF7Tz/MrrvGuzN3ZmchzV8aeT17zj3n/u+5d87cxyoR4fsMpVQx
+MBkYC+QDQ4DBQDtQ7XmEviUESqnBwAKgFHgaGAP0iRC5AWwDtojI1e8FAUqp4cBzwExgBpAVRexb
+4E/AJhG52n1XRP4vL2Ag8DOgFmgDJMYVBPYCT0ct51FXJEbl+gLpMb77IbAZuGpS6fBVD6wys6W+
+C4OgUiodeBGYC4zHaN1OoAU4CxzGaOVFwHR69ulo+Bb4HfCmiNw1lfwOtPY84AzWral7HQfKtO0/
+4sqvA+66VPFO4PeA15YPj7Dyz4VC1Y3KtwIvOvLjEVW+CPi3TuUyMzOtZC4DJY59eQSVTwL26VR+
+48aNcu/ePXn++edjyVwAiuPy5xEQ8Gvdlr97966IiLz99tvRZPzA2Hj9sXqcuAql1CLgVR3Ze/fu
+ce7cOUSE/fv39/oaeFVEzsft1ENs+TwggI3BbcSIEVJcXBztu39iEFkBpGra7xtN9qEkQqFE568Y
+SYzbuAU0YHQJP0aGeBODKICRQAHQCPxCHqzwQ2r93+BeomM3NzgCVMXyLeERoJSaDewC0hJqyEAb
+xpPhLHAa+LuInDBTSCgBSql+wCGMEEwULgN/AfYDB0Xkti3tBIf+H0hQeCulBKgG+n4nH4NKqXnA
+mkSUnZmZyaZNmxgyZMhgEbkTV2EJavlU4CQWrejz+SQjI0O71VNTU2XBggXyxRdfiIhIZWXlN0BK
+PL4makpsIzDBSmjz5s3Mnz+fQ4cOceHCBQKBAM3Nzdy+fZs7d+6glGLAgAH4fD6Ki4uZNWsWeXl5
+3fqTJk3K2rt372xgt2NPE9D6+RhvZ6atmZubK/fv35d48MknnwiwOR5/EzEGvAn0txKqqqoiOTk5
+LkPPPvss/fv3/1E8ZbhKgFJqDjBfR7a0tDRue16vl/z8/LGhx60juEaAUkoBvwTrcSUzM5NnnnnG
+Fbv5+flpQLlTfTcj4KdoOpKXl0f//pa9RAsFBQUAE53qu0KAUioF2KArP2DAADfMAvDkk0+CMZPs
+CG5FwAsY01xaSE9Pd8ksFBUV4fF4xjrVj5sApVQSsNqOjsfjXvqRnZ3NsGHDRimlHPUpNyJgNTb7
+YEtLiwtm/4fs7OxUYIoT3bgICI38tvN9v98fTppcwdChQwFynejGGwFVwDS7Si0tLWzdupWvv/46
+TvMGfD4fwAgnuvESsNKJUjAY5JVXXmHMmDEsXLiQHTt2EAwGHTsxePBggKGOlOPI+Qsxdlm48n4/
+depU+fjjjx29E7zzzjsC1DqqRxwEbHGr8uHL4/HI+vXrpb293RYB27dvF+DUQyMAYweGzvq8o2vR
+okXS0dGhTUBNTY0ATU7q4nQMWAYMc6hriZ07d/LGG29oy2dkZAD0VUrZTjCcEqD1xhcPtm7dyqVL
+l7RkQwRkAo/ZtWObAKVULhDXO7gOWltb2blzp5as1+sFoy62nwROImA54F4yH4GsrJ6buw4fPqyl
+16dPdzUG2bXpJCmf50DHEsOHD+f+/fs97ukmShEE2J5ishUBSqnxaEx2OsG4ceO4detWj3t37ujN
+eEcQoOzatdsFFuAsaizh8/no6Ojoca+wsFBLNyJykuzatUvATLsGdPH444/3ujdtmt5rRkSk2B7T
+tBWUUqOBqXYN6CAjI4ORI0f2uJeWlkZlZaWWfnt7u2Pbdhj7McaKj+soKirq1f8rKysZN26cln4E
+Affs2rZDQIndwnUxceJEmpqaetxbvHixtn4EAbZDQYuAUIqZMAImTJhAY2Njj3vNzc3a+q2treGP
+5ttio0A3AmbicMLBCklJSZSUlBAIBHrcf++997h586ZWGRHd5xu79nUJcGcVIwrGjx9PVlYWly9f
+7nH//PnzvPbaa1plhIj6Frhu174uAZPsFBp6OdFCWVkZx44d65UFAmzbto13333XsoxQF7glIu6P
+AUqpZGxmf6E5Oi2Ul5dTX18f9btgMMgHH3xgWUYoZb5lJRcNOhEwA+idpZggNEenJTd37lzOnTsX
+UyY7O9uynKtXr4KxNc42dAiwFf4Ajz2m91peXl5OWloaZ86ciSnzYIL0IILBYPiJ8R8bLnZDh4Bi
+u4XqLn3NmDGDixcvmkbAE088YVpGY2NjeAxwtNqiQ8BTtgrs00dr8TM1NZXKykoOHDjQ6yUoEqNG
+jTItp66uLjyl7miRwZQApdQQYLSdAlNTU7UImDx5Mjk5OXz55ZcxZbxeLxMnmq+6RUybuU8Axgkt
+W/l/V1eX1mOwoqICwJSAwsJCBg0yn+SJyB+u6foYCSsCbIU/GNPsVk+B5ORkqqqqOH36tOkAOGmS
+9fgbigABHG2dtyIgz+L7Xujs7CQzM9NUpqSkhKKiInbv3k1nZ2dMueJi6/H34sWLYGSA/7LnqQEr
+An5gt0ARYeDAgabdYN48Y1px3759MWWSkpKYPt18d73f76ehoQHgiog4WlyMSYBSqg8OCAAjCmK9
+y2dlZbF06VIaGxv5/PPPY5ZRUFDA2LHmGz+OHj0ajiC/Ez/BPALGYTMDDOPatWuMHx992878+fMZ
+MWIENTU1pjM5s2bNsrQTMX40OHATMCcgHwezrGAMTLEIWLZsGQA1NTWmZcyePdvSTl1dXfjjBTv+
+9YDJAujPcbi4WVVVJUeOHOl1f/LkyRIMBuX48ePi8Xhi6o8ePVq6urpMF0SDwaCMGjVKME6HFzpZ
+GLVaHHW8+NnQ0MC0adN6bGwGWLVqFUopPvzwQ9PRv6KiInKuPyrq6+u5cuUKQBPG2WNnMImA7TiM
+gJSUFAkEAvLyyy9338vJyZG2tjbp6OiQ3NxcU/29e/daLom///77Yfm/OW19qwhwtuUEY6HiwIED
+PQaylStX4vV6qa6uDj+6omLChAnMmTPH0kbEABjf2UGTCDhHHJscNmzYIB0dHZKdnS3Dhg2T69ev
+i4hIeXm5qd7rr79u2foiImVlZWGd9fFEQNRlrtAskOMIAOMZ7fF4mDlzJkOHDsXn81FbW8uhQ4di
+6ni9XpYuXWpZ9vXr1zlxovsw2Nl4/IzV+k/hwn6furo6qa2tlRs3boiIyOLFi011Fi5cqNX61dXV
+YZ2baJ4cjRnpMQj4SbwEAPLWW291O338+HFJS0szla+pqdEiYN26dWGdA/FU3oyAF9wgoKKiotvp
+JUuWmMpOmTJFgsGgFgFFRUVhvd8mioBfuUFAcnKynDx5Ug4fPiwpKSmmslu2bNGqfH19vSQlJYX1
+VsZLQKy1fsdHUCLR0dHBRx99xNmzZ6PO+4cxcuRIVq/W23D+6aef0tXVBXAf41RqXIhFQLRfYnKE
+6upqy93hK1asoG/fvlrlHT16NPyxXkT8cTkHMbvATlzoAjpXv379xO/3a4V/V1dXOP8X4I/xhr+Y
+ZIKuRYAVli9frrX4AcYEit/vD/970g37sQiwveHQCdLT03nppZe05ffs2RP+KMA/XHEiRheIKw3W
+vZYvX64V+mEUFhaGdS8ROvof7xWLgOZEVz4pKUk+++wz7cofPHgwfGRegB1uVD7qGKCUSuUhdIG5
+c+dSVlamLb9nz55w44Bb4U/0McBHgrbCRmLt2rW25CNmkIPAQdcciQj7EmATxs9RJDT8S0tLtdNe
+EZFTp05FTqHVuxX+IoJHKTUIeBtYgsuHqWNh7dq1GAfO9LBr167IKbTYc+kO8WceUtIDSEFBga3T
+ICIi06dPjyzjBVcjANiKsQBiex+AE6xZsybmydG2tja++uorrly5QlNTE4FAgEAgwLFjx8IiHRg/
+xOYalIiEDz+vBVZgbIdNSFfIyclh9+7dNDU1dVcw8q/f76etrc2siBMiMtlNn3r9jpBSqhSYjTEo
+5mNMjztaIHkQKSkpdHZ2Wp0RvI2x2NkS+tsc+nsNqBMRV8cA0x9SCh2NHYtxRnA0MBwYgJEnhC+z
+        17h2jP27d0Kf2zH2893G2NNzM3S1YvzAYgDj9Ffsd2eX8V/DpporbFKohAAAAABJRU5ErkJggg== }

    wm iconphoto . -default rpicon
 }
@@ -240,6 +271,9 @@ set Option(PrintOrient) landscape
 set OptDescr(PrintFill) "(0/1) If 1, fill entire page when printing"
 set Option(PrintFill) 1

+set OptDescr(WrapCal) "(0/1) If 1, make printed calendars occupy at most 5 rows"
+set Option(WrapCal) 0
+
 set OptDescr(PrintDaysRight) "(0/1) If 1, put day numbers in the top-right of each calendar box"
 set Option(PrintDaysRight) 1

@@ -1290,6 +1324,7 @@ proc DoPrint {} {
    radiobutton .p.portrait -text "Portrait" -variable Option(PrintOrient) -value portrait

    checkbutton .p.fill -text "Fill page" -variable Option(PrintFill)
+    checkbutton .p.wrap -text "Use at most 5 rows (PDF only)" -variable Option(WrapCal)
    checkbutton .p.right -text "Day numbers at top-right" -variable Option(PrintDaysRight)
    checkbutton .p.encoding -text "ISO 8859-1 PostScript encoding" -variable Option(PrintEncoding)
    checkbutton .p.calendars -text "Print small calendars" -variable Option(PrintSmallCalendars)
@@ -1300,12 +1335,14 @@ proc DoPrint {} {
    if {$HaveRem2PDF} {
        pack .p.f1 .p.ff .p.f2 .p.f2a .p.f3 .p.f3a \
            -side top -fill both -expand 1 -anchor w
+        pack .p.fill .p.wrap .p.right .p.encoding .p.calendars -in .p.f3a \
+	    -side top -anchor w -fill none -expand 0
    } else {
        pack .p.f1 .p.f2 .p.f2a .p.f3 .p.f3a \
            -side top -fill both -expand 1 -anchor w
-    }
-    pack .p.fill .p.right .p.encoding .p.calendars -in .p.f3a \
+        pack .p.fill .p.right .p.encoding .p.calendars -in .p.f3a \
 	    -side top -anchor w -fill none -expand 0
+    }
    pack .p.f4 -side top -fill both -expand 1 -anchor w
    pack .p.f11 .p.f12 -in .p.f1 -side top -fill none -expand 0 -anchor w
    pack .p.tofile .p.filename .p.browse -in .p.f11 -side left -fill none -expand 0 -anchor w
@@ -1398,6 +1435,11 @@ proc DoPrint {} {
        }
    }

+    if {$Option(WrapCal)} {
+        if {$Option(PrintFormat) == "pdf"} {
+            append cmd " --wrap"
+        }
+    }
    if {$Option(PrintOrient) == "landscape"} {
 	append cmd " -l"
    }
@@ -3326,7 +3368,9 @@ proc EditableEnter { w } {
        set c [$w tag cget $ctag -foreground]
    }
    if {"$c" != ""} {
-        $w tag configure $tag -underline 1 -underlinefg $c
+        $w tag configure $tag -underline 1
+        # underlinefg not supported on older versions of Tk
+        eval { $w tag configure $tag -underlinefg $c }
    } else {
        $w tag configure $tag -underline 1
    }
@@ -3633,7 +3677,9 @@ proc DoShadeSpecial { n r g b } {
 #***********************************************************************
 proc DoMoonSpecial { n stuff fntag day } {
    set msg ""
-    set num [scan $stuff "%d %d %d %s" phase junk1 junk2 msg]
+    # Yes, this is gross, but the odds of ctrl-A appearing
+    # in the text associated with a MOON are small.
+    set num [scan $stuff {%d %d %d %[^]} phase junk1 junk2 msg]
    if {$num < 1} {
 	return
    }
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,6 +71,9 @@ install-stripped: install
 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

--- a/src/calendar.c
+++ b/src/calendar.c
@@ -497,7 +497,7 @@ get_month_abbrev(char const *mon)
    return buf;
 #else
    char *s;
-    wchar_t tmp_buf[128];
+    wchar_t tmp_buf[128] = {0};
    wchar_t *ws;
    int i;
    int len;
@@ -621,7 +621,6 @@ Colorize256(int r, int g, int b, int bg, int clamp)
 	    best = (int) i;
 	}
    }
-    cur = &XTerm256Colors[best];
    if (bg) {
        sprintf(buf, "\x1B[48;5;%dm", best);
    } else {
@@ -1812,8 +1811,12 @@ static int DoCalRem(ParsePtr p, int col)
 	FindToken(DBufValue(&buf), &tok);
 	DBufFree(&buf);
 	if (tok.type == T_Empty || tok.type == T_Comment) {
+            r = OK;
+            if (trig.addomit) {
+                r = AddGlobalOmit(LastTriggerDate);
+            }
 	    FreeTrig(&trig);
-	    return OK;
+	    return r;
 	}
 	if (tok.type != T_RemType || tok.val == SAT_TYPE) {
 	    FreeTrig(&trig);
@@ -1831,6 +1834,10 @@ static int DoCalRem(ParsePtr p, int col)
 	    DBufFree(&buf);
 	}
 	trig.typ = tok.val;
+
+        /* Convert some SPECIALs back to plain types */
+        FixSpecialType(&trig);
+
        if (trig.typ == MSG_TYPE ||
            trig.typ == CAL_TYPE ||
            trig.typ == MSF_TYPE) {
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -7,9 +7,6 @@
 /* Define if your <sys/time.h> declares struct tm.  */
 #undef TM_IN_SYS_TIME

-/* Define if you have the <sys/file.h> header file.  */
-#undef HAVE_SYS_FILE_H
-
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H

--- a/src/dorem.c
+++ b/src/dorem.c
@@ -123,8 +123,12 @@ int DoRem(ParsePtr p)
 	    }
 	    StrnCpy(trig.passthru, DBufValue(&buf), PASSTHRU_LEN);
 	    DBufFree(&buf);
-	}
-	trig.typ = tok.val;
+        }
+        trig.typ = tok.val;
+
+        /* Convert some SPECIALs back to plain types */
+        FixSpecialType(&trig);
+
 	dse = LastTriggerDate;
 	if (!LastTrigValid || PurgeMode) {
 	    FreeTrig(&trig);
@@ -188,16 +192,18 @@ int DoRem(ParsePtr p)

    r = OK;
    if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
-	if ( (r=TriggerReminder(p, &trig, &tim, dse)) ) {
+	if ( (r=TriggerReminder(p, &trig, &tim, dse, 0)) ) {
 	    FreeTrig(&trig);
 	    return r;
 	}
    } 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;
+                }
            }
        }
    }
@@ -344,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);
@@ -370,6 +386,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals)
 		}
 		StrnCpy(trig->passthru, DBufValue(&buf), PASSTHRU_LEN);
 	    }
+            FixSpecialType(trig);
            parsing = 0;
            break;

@@ -893,7 +910,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 dse)
+int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued)
 {
    int r, y, m, d;
    char PrioExpr[VAR_NAME_LEN+25];
@@ -901,8 +918,21 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse)
    DynamicBuffer buf, calRow;
    DynamicBuffer pre_buf;
    char const *s;
+    char const *msg_command = NULL;
    Value v;

+    if (MsgCommand) {
+        msg_command = MsgCommand;
+    }
+    if (is_queued && QueuedMsgCommand) {
+        msg_command = QueuedMsgCommand;
+    }
+
+    /* A null command is no command */
+    if (msg_command && !*msg_command) {
+        msg_command = NULL;
+    }
+
    int red = -1, green = -1, blue = -1;
    int is_color = 0;

@@ -947,7 +977,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse)
    }
 /* 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) 
-	&& !DidMsgReminder && !NextMode && !MsgCommand) {
+	&& !DidMsgReminder && !NextMode && !msg_command) {
        DidMsgReminder = 1;
 	if (!DoSubstFromString(DBufValue(&Banner), &buf,
 			       DSEToday, NO_TIME) &&
@@ -1091,7 +1121,7 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse)
 	DBufPuts(&buf, Decolorize());
    }

-    if ((!MsgCommand && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) {
+    if ((!msg_command && t->typ == MSG_TYPE) || t->typ == MSF_TYPE) {
 	if (DBufPutc(&buf, '\n') != OK) {
 	    DBufFree(&buf);
 	    return E_NO_MEM;
@@ -1113,8 +1143,8 @@ int TriggerReminder(ParsePtr p, Trigger *t, TimeTrig *tim, int dse)
    switch(t->typ) {
    case MSG_TYPE:
    case PASSTHRU_TYPE:
-	if (MsgCommand) {
-	    DoMsgCommand(MsgCommand, DBufValue(&buf));
+	if (msg_command) {
+	    DoMsgCommand(msg_command, DBufValue(&buf));
 	} else {
 	    printf("%s", DBufValue(&buf));
 	}
@@ -1182,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;
@@ -1219,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);
 }

 /***************************************************************/
@@ -1466,3 +1505,25 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int dse, int *err)
 	}
    }
 }
+
+void FixSpecialType(Trigger *t)
+{
+    if (t->typ != PASSTHRU_TYPE) {
+        return;
+    }
+
+    /* Convert SPECIAL MSG / MSF / RUN / CAL to just plain MSG / MSF / etc */
+    if (!StrCmpi(t->passthru, "MSG")) {
+        t->typ = MSG_TYPE;
+    } else if (!StrCmpi(t->passthru, "MSF")) {
+        t->typ = MSF_TYPE;
+    } else if (!StrCmpi(t->passthru, "RUN")) {
+        t->typ = RUN_TYPE;
+    } else if (!StrCmpi(t->passthru, "CAL")) {
+        t->typ = CAL_TYPE;
+    } else if (!StrCmpi(t->passthru, "PS")) {
+        t->typ = PS_TYPE;
+    } else if (!StrCmpi(t->passthru, "PSFILE")) {
+        t->typ = PSF_TYPE;
+    }
+}
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -196,7 +196,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                mode != CAL_MODE &&
                mode != ADVANCE_MODE &&
 		t->typ != RUN_TYPE &&
-                !MsgCommand) {
+                !(MsgCommand && *MsgCommand)) {
 		if (DBufPutc(dbuf, '\n') != OK) return E_NO_MEM;
 	    }
 	    break;
@@ -363,464 +363,464 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse,
                    Eprint("%s", ErrMsg[r]);
                }
            }
+            switch(UPPER(c)) {
+            case 'A':
+#ifdef L_A_OVER
+                L_A_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %d %s, %d", get_day_name(dse%7), d,
+                                 get_month_name(m), y);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %d %s, %d", DynamicOn, get_day_name(dse%7), d,
+                                 get_month_name(m), y);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'B':
+#ifdef L_B_OVER
+                L_B_OVER
+#else
+                    snprintf(s, sizeof(s), L_INXDAYS, diff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'C':
+#ifdef L_C_OVER
+                L_C_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s", DynamicOn, get_day_name(dse%7));
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'D':
+#ifdef L_D_OVER
+                L_D_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", d);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'E':
+#ifdef L_E_OVER
+                L_E_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%02d%c%02d%c%04d", d, DateSep,
+                                 m+1, DateSep, y);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, d, DateSep,
+                                 m+1, DateSep, y);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'F':
+#ifdef L_F_OVER
+                L_F_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, m+1, DateSep, d, DateSep, y);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'G':
+#ifdef L_G_OVER
+                L_G_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %d %s", get_day_name(dse%7), d, get_month_name(m));
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %d %s", DynamicOn, get_day_name(dse%7), d, get_month_name(m));
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'H':
+#ifdef L_H_OVER
+                L_H_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%02d%c%02d", d, DateSep, m+1);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, d, DateSep, m+1);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'I':
+#ifdef L_I_OVER
+                L_I_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%02d%c%02d", m+1, DateSep, d);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, m+1, DateSep, d);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'J':
+#ifdef L_J_OVER
+                L_J_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %s %d%s, %d", get_day_name(dse%7),
+                                 get_month_name(m), d, plu, y);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", DynamicOn, get_day_name(dse%7),
+                                 get_month_name(m), d, plu, y);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'K':
+#ifdef L_K_OVER
+                L_K_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %s %d%s", get_day_name(dse%7),
+                                 get_month_name(m), d, plu);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %s %d%s", DynamicOn, get_day_name(dse%7),
+                                 get_month_name(m), d, plu);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'L':
+#ifdef L_L_OVER
+                L_L_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", DynamicOn, y, DateSep, m+1, DateSep, d);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'M':
+#ifdef L_M_OVER
+                L_M_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", get_month_name(m));
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'N':
+#ifdef L_N_OVER
+                L_N_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", m+1);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'O':
+#ifdef L_O_OVER
+                L_O_OVER
+#else
+                    if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", DynamicToday);
+                    else *s = 0;
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'P':
+#ifdef L_P_OVER
+                L_P_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", (diff == 1 ? "" : L_PLURAL));
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'Q':
+#ifdef L_Q_OVER
+                L_Q_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", (diff == 1 ? "'s" : "s'"));
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'R':
+#ifdef L_R_OVER
+                L_R_OVER
+#else
+                    snprintf(s, sizeof(s), "%02d", d);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'S':
+#ifdef L_S_OVER
+                L_S_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", plu);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'T':
+#ifdef L_T_OVER
+                L_T_OVER
+#else
+                    snprintf(s, sizeof(s), "%02d", m+1);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'U':
+#ifdef L_U_OVER
+                L_U_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %d%s %s, %d", get_day_name(dse%7), d,
+                                 plu, get_month_name(m), y);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", DynamicOn, get_day_name(dse%7), d,
+                                 plu, get_month_name(m), y);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'V':
+#ifdef L_V_OVER
+                L_V_OVER
+#else
+                    if (altmode == '*' || !strcmp(DynamicOn, "")) {
+                        snprintf(s, sizeof(s), "%s, %d%s %s", get_day_name(dse%7), d, plu,
+                                 get_month_name(m));
+                    } else {
+                        snprintf(s, sizeof(s), "%s %s, %d%s %s", DynamicOn, get_day_name(dse%7), d, plu,
+                                 get_month_name(m));
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'W':
+#ifdef L_W_OVER
+                L_W_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'X':
+#ifdef L_X_OVER
+                L_X_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", diff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'Y':
+#ifdef L_Y_OVER
+                L_Y_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", y);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case 'Z':
+#ifdef L_Z_OVER
+                L_Z_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", y % 100);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '1':
+#ifdef L_1_OVER
+                L_1_OVER
+#else
+                    if (tdiff == 0)
+                        snprintf(s, sizeof(s), "%s", DynamicNow);
+                    else if (hdiff == 0)
+                        snprintf(s, sizeof(s), "%d %s%s %s", mdiff, DynamicMinute, mplu, when);
+                    else if (mdiff == 0)
+                        snprintf(s, sizeof(s), "%d %s%s %s", hdiff, DynamicHour, hplu, when);
+                    else
+                        snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, DynamicHour, hplu,
+                                 DynamicAnd, mdiff, DynamicMinute, mplu, when);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '2':
+#ifdef L_2_OVER
+                L_2_OVER
+#else
+                    if (altmode == '*') {
+                        snprintf(s, sizeof(s), "%d%c%02d%s", hh, TimeSep, min, pm);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %d%c%02d%s", DynamicAt, hh, TimeSep, min, pm);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '3':
+#ifdef L_3_OVER
+                L_3_OVER
+#else
+
+                    if (altmode == '*') {
+                        snprintf(s, sizeof(s), "%02d%c%02d", h, TimeSep, min);
+                    } else {
+                        snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicAt, h, TimeSep, min);
+                    }
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '4':
+#ifdef L_4_OVER
+                L_4_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", tdiff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '5':
+#ifdef L_5_OVER
+                L_5_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", adiff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '6':
+#ifdef L_6_OVER
+                L_6_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", when);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '7':
+#ifdef L_7_OVER
+                L_7_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", hdiff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '8':
+#ifdef L_8_OVER
+                L_8_OVER
+#else
+                    snprintf(s, sizeof(s), "%d", mdiff);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '9':
+#ifdef L_9_OVER
+                L_9_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", mplu);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '0':
+#ifdef L_0_OVER
+                L_0_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", hplu);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '!':
+#ifdef L_BANG_OVER
+                L_BANG_OVER
+#else
+                    snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? DynamicIs : DynamicWas));
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '@':
+#ifdef L_AT_OVER
+                L_AT_OVER
+#else
+                    snprintf(s, sizeof(s), "%d%c%02d%s", chh, TimeSep, cmin, cpm);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '#':
+#ifdef L_HASH_OVER
+                L_HASH_OVER
+#else
+                    snprintf(s, sizeof(s), "%02d%c%02d", ch, TimeSep, cmin);
+#endif
+                SHIP_OUT(s);
+                break;
+
+            case '_':
+                if (PsCal == PSCAL_LEVEL2 || PsCal == PSCAL_LEVEL3 || (mode != CAL_MODE && mode != ADVANCE_MODE && !(MsgCommand && *MsgCommand))) {
+                    snprintf(s, sizeof(s), "%s", NL);
+                } else {
+                    snprintf(s, sizeof(s), " ");
+                }
+                SHIP_OUT(s);
+                break;
+
+            case QUOTE_MARKER:
+                /* Swallow any QUOTE_MARKERs which may somehow creep in... */
+                break;
+
+            case '"':
+                if (DontSuppressQuoteMarkers) {
+                    if (DBufPutc(dbuf, '%') != OK) return E_NO_MEM;
+                    if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
+                } else {
+                    if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
+                    has_quote = 1;
+                }
+                break;
+
+            default:
+                if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
+            }
        }

-	if (!done) switch(UPPER(c)) {
-	case 'A':
-#ifdef L_A_OVER
-	    L_A_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %d %s, %d", get_day_name(dse%7), d,
-			get_month_name(m), y);
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %d %s, %d", DynamicOn, get_day_name(dse%7), d,
-			get_month_name(m), y);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'B':
-#ifdef L_B_OVER
-	    L_B_OVER
-#else
-	    snprintf(s, sizeof(s), L_INXDAYS, diff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'C':
-#ifdef L_C_OVER
-	    L_C_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
-	    } else {
-		snprintf(s, sizeof(s), "%s %s", DynamicOn, get_day_name(dse%7));
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'D':
-#ifdef L_D_OVER
-	    L_D_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", d);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'E':
-#ifdef L_E_OVER
-	    L_E_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%02d%c%02d%c%04d", d, DateSep,
-			m+1, DateSep, y);
-	    } else {
-		snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, d, DateSep,
-			m+1, DateSep, y);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'F':
-#ifdef L_F_OVER
-	    L_F_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%02d%c%02d%c%04d", m+1, DateSep, d, DateSep, y);
-	    } else {
-		snprintf(s, sizeof(s), "%s %02d%c%02d%c%04d", DynamicOn, m+1, DateSep, d, DateSep, y);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'G':
-#ifdef L_G_OVER
-	    L_G_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %d %s", get_day_name(dse%7), d, get_month_name(m));
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %d %s", DynamicOn, get_day_name(dse%7), d, get_month_name(m));
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'H':
-#ifdef L_H_OVER
-	    L_H_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%02d%c%02d", d, DateSep, m+1);
-	    } else {
-		snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, d, DateSep, m+1);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'I':
-#ifdef L_I_OVER
-	    L_I_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%02d%c%02d", m+1, DateSep, d);
-	    } else {
-		snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicOn, m+1, DateSep, d);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'J':
-#ifdef L_J_OVER
-	    L_J_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %s %d%s, %d", get_day_name(dse%7),
-			get_month_name(m), d, plu, y);
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %s %d%s, %d", DynamicOn, get_day_name(dse%7),
-			get_month_name(m), d, plu, y);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'K':
-#ifdef L_K_OVER
-	    L_K_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %s %d%s", get_day_name(dse%7),
-			get_month_name(m), d, plu);
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %s %d%s", DynamicOn, get_day_name(dse%7),
-			get_month_name(m), d, plu);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'L':
-#ifdef L_L_OVER
-	    L_L_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%04d%c%02d%c%02d", y, DateSep, m+1, DateSep, d);
-	    } else {
-		snprintf(s, sizeof(s), "%s %04d%c%02d%c%02d", DynamicOn, y, DateSep, m+1, DateSep, d);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'M':
-#ifdef L_M_OVER
-	    L_M_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", get_month_name(m));
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'N':
-#ifdef L_N_OVER
-	    L_N_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", m+1);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'O':
-#ifdef L_O_OVER
-	    L_O_OVER
-#else
-            if (RealToday == DSEToday) snprintf(s, sizeof(s), " (%s)", DynamicToday);
-	    else *s = 0;
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'P':
-#ifdef L_P_OVER
-	    L_P_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", (diff == 1 ? "" : L_PLURAL));
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'Q':
-#ifdef L_Q_OVER
-	    L_Q_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", (diff == 1 ? "'s" : "s'"));
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'R':
-#ifdef L_R_OVER
-	    L_R_OVER
-#else
-	    snprintf(s, sizeof(s), "%02d", d);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'S':
-#ifdef L_S_OVER
-	    L_S_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", plu);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'T':
-#ifdef L_T_OVER
-	    L_T_OVER
-#else
-	    snprintf(s, sizeof(s), "%02d", m+1);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'U':
-#ifdef L_U_OVER
-	    L_U_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %d%s %s, %d", get_day_name(dse%7), d,
-			plu, get_month_name(m), y);
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %d%s %s, %d", DynamicOn, get_day_name(dse%7), d,
-			plu, get_month_name(m), y);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'V':
-#ifdef L_V_OVER
-	    L_V_OVER
-#else
-            if (altmode == '*' || !strcmp(DynamicOn, "")) {
-		snprintf(s, sizeof(s), "%s, %d%s %s", get_day_name(dse%7), d, plu,
-			get_month_name(m));
-	    } else {
-		snprintf(s, sizeof(s), "%s %s, %d%s %s", DynamicOn, get_day_name(dse%7), d, plu,
-			get_month_name(m));
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'W':
-#ifdef L_W_OVER
-	    L_W_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", get_day_name(dse%7));
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'X':
-#ifdef L_X_OVER
-	    L_X_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", diff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'Y':
-#ifdef L_Y_OVER
-	    L_Y_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", y);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case 'Z':
-#ifdef L_Z_OVER
-	    L_Z_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", y % 100);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '1':
-#ifdef L_1_OVER
-	    L_1_OVER
-#else
-	    if (tdiff == 0)
-		snprintf(s, sizeof(s), "%s", DynamicNow);
-	    else if (hdiff == 0)
-		snprintf(s, sizeof(s), "%d %s%s %s", mdiff, DynamicMinute, mplu, when);
-	    else if (mdiff == 0)
-		snprintf(s, sizeof(s), "%d %s%s %s", hdiff, DynamicHour, hplu, when);
-	    else
-		snprintf(s, sizeof(s), "%d %s%s %s %d %s%s %s", hdiff, DynamicHour, hplu,
-			DynamicAnd, mdiff, DynamicMinute, mplu, when);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '2':
-#ifdef L_2_OVER
-	    L_2_OVER
-#else
-	    if (altmode == '*') {
-		snprintf(s, sizeof(s), "%d%c%02d%s", hh, TimeSep, min, pm);
-	    } else {
-		snprintf(s, sizeof(s), "%s %d%c%02d%s", DynamicAt, hh, TimeSep, min, pm);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '3':
-#ifdef L_3_OVER
-	    L_3_OVER
-#else
-
-	    if (altmode == '*') {
-		snprintf(s, sizeof(s), "%02d%c%02d", h, TimeSep, min);
-	    } else {
-		snprintf(s, sizeof(s), "%s %02d%c%02d", DynamicAt, h, TimeSep, min);
-	    }
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '4':
-#ifdef L_4_OVER
-	    L_4_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", tdiff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '5':
-#ifdef L_5_OVER
-	    L_5_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", adiff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '6':
-#ifdef L_6_OVER
-	    L_6_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", when);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '7':
-#ifdef L_7_OVER
-	    L_7_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", hdiff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '8':
-#ifdef L_8_OVER
-	    L_8_OVER
-#else
-	    snprintf(s, sizeof(s), "%d", mdiff);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '9':
-#ifdef L_9_OVER
-	    L_9_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", mplu);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '0':
-#ifdef L_0_OVER
-	    L_0_OVER
-#else
-	    snprintf(s, sizeof(s), "%s", hplu);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '!':
-#ifdef L_BANG_OVER
-	    L_BANG_OVER
-#else
-            snprintf(s, sizeof(s), "%s", (tdiff >= 0 ? DynamicIs : DynamicWas));
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '@':
-#ifdef L_AT_OVER
-	    L_AT_OVER
-#else
-	    snprintf(s, sizeof(s), "%d%c%02d%s", chh, TimeSep, cmin, cpm);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '#':
-#ifdef L_HASH_OVER
-	    L_HASH_OVER
-#else
-	    snprintf(s, sizeof(s), "%02d%c%02d", ch, TimeSep, cmin);
-#endif
-	    SHIP_OUT(s);
-	    break;
-
-	case '_':
-	    if (PsCal == PSCAL_LEVEL2 || PsCal == PSCAL_LEVEL3 || (mode != CAL_MODE && mode != ADVANCE_MODE && !MsgCommand)) {
-		snprintf(s, sizeof(s), "%s", NL);
-	    } else {
-		snprintf(s, sizeof(s), " ");
-	    }
-	    SHIP_OUT(s);
-	    break;
-
-	case QUOTE_MARKER:
-	    /* Swallow any QUOTE_MARKERs which may somehow creep in... */
-	    break;
-
-	case '"':
-            if (DontSuppressQuoteMarkers) {
-                if (DBufPutc(dbuf, '%') != OK) return E_NO_MEM;
-                if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
-            } else {
-                if (DBufPutc(dbuf, QUOTE_MARKER) != OK) return E_NO_MEM;
-                has_quote = 1;
-            }
-	    break;
-
-	default:
-	    if (DBufPutc(dbuf, c) != OK) return E_NO_MEM;
-	}
 	if (isupper(c)) {
 	    os = DBufValue(dbuf);
 	    os += strlen(os) - strlen(s);
--- a/src/expr.c
+++ b/src/expr.c
@@ -376,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 + */
 	}
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -27,13 +27,9 @@
 #include <ctype.h>
 #include <math.h>
 #include <sys/ioctl.h>
-
+#include <fcntl.h>
 #include <unistd.h>

-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-
 #include <sys/types.h>

 #include <sys/stat.h>
@@ -101,6 +97,8 @@ static int FHebday         (func_info *);
 static int FHebmon         (func_info *);
 static int FHebyear        (func_info *);
 static int FHour           (func_info *);
+static int FHtmlEscape     (func_info *);
+static int FHtmlStriptags  (func_info *);
 static int FIif            (func_info *);
 static int FIndex          (func_info *);
 static int FIsdst          (func_info *);
@@ -265,6 +263,8 @@ BuiltinFunc Func[] = {
    {   "hebmon",       1,      1,      0,          FHebmon },
    {   "hebyear",      1,      1,      0,          FHebyear },
    {   "hour",         1,      1,      1,          FHour   },
+    {   "htmlescape",   1,      1,      1,          FHtmlEscape },
+    {   "htmlstriptags",1,      1,      1,          FHtmlStriptags },
    {   "iif",          1,      NO_MAX, 1,          FIif    },
    {   "index",        2,      3,      1,          FIndex  },
    {   "isany",        1,      NO_MAX, 1,          FIsAny  },
@@ -914,9 +914,14 @@ static int FAbs(func_info *info)

    ASSERT_TYPE(0, INT_TYPE);
    v = ARGV(0);
+    if (v == INT_MIN) return E_2HIGH;
+
    RetVal.type = INT_TYPE;
    RETVAL = (v < 0) ? (-v) : v;
    v = RETVAL;
+
+    /* The following test is probably redundant given the test
+       for v == INT_MIN above, but I'll leave it in just in case. */
    if (v < 0) return E_2HIGH;
    return OK;
 }
@@ -957,7 +962,7 @@ static int parse_color_helper(char const *str, int *r, int *g, int *b)
 static int FAnsicolor(func_info *info)
 {
    int r=0, g=0, b=0, bg=0, clamp=1;
-    int status = 0;
+    int status;
    int index = 0;
    bg = 0;
    clamp = 1;
@@ -1162,15 +1167,27 @@ static int FPad(func_info *info)
    if (Nargs < 4 || !ARGV(3)) {
        /* Pad on the LEFT */
        for (i=0; i<wantlen-len; i++) {
-            DBufPutc(&dbuf, *s++);
+            if (DBufPutc(&dbuf, *s++) != OK) {
+                DBufFree(&dbuf);
+                return E_NO_MEM;
+            }
            if (!*s) s = ARGSTR(1);
        }
-        DBufPuts(&dbuf, ARGSTR(0));
+        if (DBufPuts(&dbuf, ARGSTR(0)) != OK) {
+                DBufFree(&dbuf);
+                return E_NO_MEM;
+        }
    } else {
        /* Pad on the RIGHT */
-        DBufPuts(&dbuf, ARGSTR(0));
+        if (DBufPuts(&dbuf, ARGSTR(0)) != OK) {
+            DBufFree(&dbuf);
+            return E_NO_MEM;
+        }
        for (i=0; i<wantlen-len; i++) {
-            DBufPutc(&dbuf, *s++);
+            if (DBufPutc(&dbuf, *s++) != OK) {
+                DBufFree(&dbuf);
+                return E_NO_MEM;
+            }
            if (!*s) s = ARGSTR(1);
        }
    }
@@ -2243,6 +2260,92 @@ static int FHebyear(func_info *info)
    RETVAL = y;
    return OK;
 }
+
+/****************************************************************/
+/*                                                              */
+/* htmlescape - replace <. > and & by &lt; &gt; and &amp;       */
+/*                                                              */
+/****************************************************************/
+static int FHtmlEscape(func_info *info)
+{
+    DynamicBuffer dbuf;
+    char const *s;
+    int r;
+
+    ASSERT_TYPE(0, STR_TYPE);
+
+    DBufInit(&dbuf);
+
+    s = ARGSTR(0);
+    while(*s) {
+        switch(*s) {
+        case '<':
+            r = DBufPuts(&dbuf, "&lt;");
+            break;
+
+        case '>':
+            r = DBufPuts(&dbuf, "&gt;");
+            break;
+
+        case '&':
+            r = DBufPuts(&dbuf, "&amp;");
+            break;
+
+        default:
+            r = DBufPutc(&dbuf, *s);
+            break;
+        }
+        if (r != OK) {
+            DBufFree(&dbuf);
+            return r;
+        }
+        s++;
+    }
+    r = RetStrVal(DBufValue(&dbuf), info);
+    DBufFree(&dbuf);
+    return r;
+}
+
+/****************************************************************/
+/*                                                              */
+/* htmlstriptags - strip out HTML tags from a string            */
+/*                                                              */
+/****************************************************************/
+static int FHtmlStriptags(func_info *info)
+{
+    DynamicBuffer dbuf;
+    char const *s;
+    int r = OK;
+
+    int in_tag = 0;
+    ASSERT_TYPE(0, STR_TYPE);
+
+    DBufInit(&dbuf);
+
+    s = ARGSTR(0);
+    while(*s) {
+        if (!in_tag) {
+            if (*s == '<') {
+                in_tag = 1;
+            } else {
+                r = DBufPutc(&dbuf, *s);
+            }
+        } else {
+            if (*s == '>') {
+                in_tag = 0;
+            }
+        }
+        if (r != OK) {
+            DBufFree(&dbuf);
+            return r;
+        }
+        s++;
+    }
+    r = RetStrVal(DBufValue(&dbuf), info);
+    DBufFree(&dbuf);
+    return r;
+}
+
 /****************************************************************/
 /*                                                              */
 /*  FEasterdate - calc. easter Sunday from a year.              */
@@ -3187,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);
@@ -3196,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;
@@ -3208,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;
@@ -3232,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)) ||
@@ -3240,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;
@@ -3252,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;
@@ -3451,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);
@@ -3458,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;
@@ -3465,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;
--- a/src/globals.h
+++ b/src/globals.h
@@ -39,7 +39,7 @@ EXTERN  FILE *ErrFp;
 #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	DSEToday;
 EXTERN	int	RealToday;
@@ -52,6 +52,7 @@ EXTERN  uid_t   TrustedUsers[MAX_TRUSTED_USERS];

 EXTERN  INIT(   int     NumTrustedUsers, 0);
 EXTERN  INIT(   char    const *MsgCommand, NULL);
+EXTERN  INIT(   char    const *QueuedMsgCommand, NULL);
 EXTERN  INIT(	int     ShowAllErrors, 0);
 EXTERN  INIT(	int     DebugFlag, 0);
 EXTERN  INIT(   int	DoCalendar, 0);
@@ -69,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);
@@ -78,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;
--- a/src/init.c
+++ b/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,12 @@
 #include "expr.h"
 #include "err.h"

+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 +174,16 @@ void InitRemind(int argc, char const *argv[])
    int x;
    int dse;
    int ttyfd;
+    int r, g, b;
+
+    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;
+        }
+    }

    dse = NO_DATE;

@@ -243,6 +260,11 @@ void InitRemind(int argc, char const *argv[])
                while(*arg) arg++;
                break;

+            case '-':
+                ProcessLongOption(arg);
+                while(*arg) arg++;
+                break;
+
 	    case '@':
 		UseVTColors = 1;
 		if (*arg) {
@@ -265,7 +287,7 @@ void InitRemind(int argc, char const *argv[])
                        } else if (x == 1) {
                            TerminalBackground = TERMINAL_BACKGROUND_LIGHT;
                        } else if (x == 2) {
-                            TerminalBackground = TERMINAL_BACKGROUND_UNKNOWN;
+                            /* do nothing */
                        } else {
                            fprintf(ErrFp, "%s: -@n,m,b: m must be 0, 1 or 2 (assuming 2)\n",
                                    argv[0]);
@@ -341,10 +363,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 +559,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 +570,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;
@@ -600,7 +632,12 @@ void InitRemind(int argc, char const *argv[])

 	    case 'k':
 	    case 'K':
-		MsgCommand = arg;
+                if (*arg == ':') {
+                    arg++;
+                    QueuedMsgCommand = arg;
+                } else {
+                    MsgCommand = arg;
+                }
 		while (*arg) arg++;  /* Chew up remaining chars in this arg */
 		break;

@@ -948,3 +985,114 @@ 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 */
+    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);
+}
--- a/src/json.c
+++ b/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:
--- a/src/langs/italian.h
+++ b/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 */
--- a/src/main.c
+++ b/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
@@ -1651,7 +1645,7 @@ System(char const *cmd)
    int r;
    r = system(cmd);
    if (r == 0) {
-	r = 1;
+        return;
    }
 }

--- a/src/moon.c
+++ b/src/moon.c
@@ -403,7 +403,7 @@ static double phase(double pdate,

    double Day, N, M, Ec, Lambdasun, ml, MM, Ev, Ae, A3, MmP,
 	mEc, A4, lP, V, lPP,
-	MoonAge, MoonPhase,
+	MoonAge, Phase,
 	MoonDist, MoonDFrac, MoonAng,
 	F, SunDist, SunAng;

@@ -465,7 +465,7 @@ static double phase(double pdate,
    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 */

@@ -477,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;
--- a/src/omit.c
+++ b/src/omit.c
@@ -377,8 +377,12 @@ int DoOmit(ParsePtr p)
 	    break;

 	default:
-	    Eprint("%s: `%s' (OMIT)", ErrMsg[E_UNKNOWN_TOKEN],
-		   DBufValue(&buf));
+            if (tok.type == T_Until) {
+                Eprint("OMIT: UNTIL not allowed; did you mean THROUGH?");
+            } else {
+                Eprint("%s: `%s' (OMIT)", ErrMsg[E_UNKNOWN_TOKEN],
+                       DBufValue(&buf));
+            }
 	    DBufFree(&buf);
 	    return E_UNKNOWN_TOKEN;
 	}
--- a/src/protos.h
+++ b/src/protos.h
@@ -35,7 +35,7 @@ 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 dse);
+int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued);
 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);
@@ -98,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);
@@ -177,9 +175,9 @@ char const *get_month_name(int mon);

 int push_call(char const *filename, char const *func, int lineno);
 void clear_callstack(void);
-int have_callstack(void);
 int print_callstack(FILE *fp);
 void pop_call(void);
+void FixSpecialType(Trigger *trig);
 #ifdef REM_USE_WCHAR
 #define _XOPEN_SOURCE 600
 #include <wctype.h>
--- a/src/queue.c
+++ b/src/queue.c
@@ -267,7 +267,7 @@ void HandleQueuedReminders(void)
 	    /* Set up global variables so some functions like trigdate()
 	       and trigtime() work correctly                             */
 	    SaveAllTriggerInfo(&(q->t), &(q->tt), DSEToday, q->tt.ttime, 1);
-	    (void) TriggerReminder(&p, &trig, &q->tt, DSEToday);
+	    (void) TriggerReminder(&p, &trig, &q->tt, DSEToday, 1);
 	    if (Daemon < 0) {
 		printf("NOTE endreminder\n");
 	    }
--- a/src/rem2ps.c
+++ b/src/rem2ps.c
@@ -390,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 */
@@ -422,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;
--- a/src/sort.c
+++ b/src/sort.c
@@ -135,7 +135,7 @@ void IssueSortedReminders(void)
 	next = cur->next;
 	switch(cur->typ) {
 	case MSG_TYPE:
-	    if (MsgCommand) {
+	    if (MsgCommand && *MsgCommand) {
 		DoMsgCommand(MsgCommand, cur->text);
            } else {
 		if (cur->trigdate != olddate) {
@@ -147,6 +147,10 @@ void IssueSortedReminders(void)
 	    break;

 	case MSF_TYPE:
+            if (cur->trigdate != olddate) {
+                IssueSortBanner(cur->trigdate);
+                olddate = cur->trigdate;
+            }
 	    FillParagraph(cur->text);
 	    break;

--- a/src/token.c
+++ b/src/token.c
@@ -258,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;
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -622,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;
 	}

@@ -640,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",
@@ -662,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;
-}
--- a/src/userfns.c
+++ b/src/userfns.c
@@ -124,8 +124,13 @@ int DoFset(ParsePtr p)
 	DBufFree(&buf);
 	return E_NO_MEM;
    }
-    func->filename = StrDup(FileName);
+    if (FileName) {
+        func->filename = StrDup(FileName);
+    } else {
+        func->filename = StrDup("[cmdline]");
+    }
    if (!func->filename) {
+        free(func);
        return E_NO_MEM;
    }
    func->lineno = LineNo;
@@ -182,7 +187,7 @@ int DoFset(ParsePtr p)
    /* Allow an optional = sign: FSET f(x) = x*x */
    c = ParseNonSpaceChar(p, &r, 1);
    if (c == '=') {
-	c = ParseNonSpaceChar(p, &r, 0);
+	(void) ParseNonSpaceChar(p, &r, 0);
    }
    /* Copy the text over */
    if (p->isnested) {
--- a/src/utils.c
+++ b/src/utils.c
@@ -41,22 +41,6 @@ char *StrnCpy(char *dest, char const *source, int n)
    return odest;
 }

-/***************************************************************/
-/*                                                             */
-/*  StrMatch                                                   */
-/*                                                             */
-/*  Checks that two strings match (case-insensitive) to at     */
-/*  least the specified number of characters, or the length    */
-/*  of the first string, whichever is greater.                 */
-/*                                                             */
-/***************************************************************/
-int StrMatch(char const *s1, char const *s2, int n)
-{
-    int l;
-    if ((l = strlen(s1)) < n) return 0;
-    return !StrinCmp(s1, s2, l);
-}
-
 /***************************************************************/
 /*                                                             */
 /*  StrinCmp - compare strings, case-insensitive               */
@@ -223,13 +207,6 @@ clear_callstack(void)
    callstack = NULL;
 }

-int
-have_callstack(void)
-{
-    if (callstack) return 1;
-    return 0;
-}
-
 static void
 print_callstack_aux(FILE *fp, cs *entry)
 {
--- a/src/var.c
+++ b/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 },
--- a/tests/test-rem
+++ b/tests/test-rem
@@ -27,6 +27,10 @@ if test `id -u` = 0 ; then
    exit 1
 fi

+# Set a known timezone so moon phases show up in predictable places
+TZ=UTC
+export TZ
+
 # If we're already in a utf-8 locale, do
 # nothing; otherwise, set LC_ALL
 OK=0
@@ -404,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
@@ -418,6 +434,12 @@ chmod 0777 include_dir/ww
 ../src/remind include_dir/ww >> ../tests/test.out 2>&1
 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
@@ -428,7 +450,11 @@ else
   echo "Remind:  Acceptance test FAILED"
   echo ""
   echo "Examine the file test.out to see where it differs from the"
-   echo "reference file test.cmp."
+   echo "reference file test.cmp.  Here are the first 200 lines of"
+   echo "diff -u test.out test.cmp"
+   echo ""
+   diff -u ../tests/test.out ../tests/test.cmp | head -n 200
+   echo ""
   exit 1
 fi

--- a/tests/test.cmp
+++ b/tests/test.cmp
--- a/tests/test.rem
+++ b/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]%
@@ -866,6 +866,27 @@ FUNSET circle square rectangle
 # Should fail
 SET a square(5)

+# htmlescape
+set a htmlescape("foo")
+REM MSG [a]
+set a htmlescape("<&>")
+REM MSG [a]
+set a htmlescape("@&^#*@&^##$*&@><><@#@#><@#>%%_#$foobarquux")
+REM MSG [a]
+
+# htmlstriptags
+set a htmlstriptags("foobar")
+set a htmlstriptags("This is <b>bold</b>")
+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

--- a/tests/test2.rem
+++ b/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!
Author	SHA1	Message	Date
Dianne Skoll	a30c467c48	Revert "Guess terminal background even if stdout is not a tty" This reverts commit `887cd83ebe`.	2023-10-04 09:36:25 -04:00
Dianne Skoll	887cd83ebe	Guess terminal background even if stdout is not a tty	2023-10-04 09:33:54 -04:00
Dianne Skoll	242d787ca2	Update release notes	2023-10-04 09:32:44 -04:00
Dianne Skoll	5dd2cf7356	Update version to 04.02.07	2023-10-04 09:32:38 -04:00
Dianne Skoll	5efb70909d	Make -w0 obtain width from STDOUT_FILENO	2023-10-04 09:32:06 -04:00
Dianne Skoll	a60d466774	Document that Remind attempts to figure out terminal background lightness.	2023-10-03 18:59:51 -04:00
Dianne Skoll	1c01f36271	Fix typo	2023-10-03 09:25:45 -04:00
Dianne Skoll	3718632551	Let Remind guess if terminal is dark or light.	2023-10-03 00:09:59 -04:00
Dianne Skoll	e8f3d5ff9f	Tweak the terminal background-color guessing code.	2023-10-03 00:04:01 -04:00
Dianne Skoll	d77e27942d	Try to guess the terminal background color.	2023-10-03 00:00:59 -04:00
Dianne Skoll	734cc61489	Better logic for checking if we should close TTY fd.	2023-10-02 23:07:34 -04:00
Dianne Skoll	44d489d3d2	Make -w0 behave the same as -wt instead of causing an infinite loop.	2023-10-02 23:03:30 -04:00
Dianne Skoll	3e36ffa9ff	Rename function.	2023-10-01 13:56:24 -04:00
Dianne Skoll	12104a96b1	Improve icon.	2023-09-29 18:06:18 -04:00
Dianne Skoll	8ab8d65a15	Document $DeltaOverride	2023-09-27 11:01:28 -04:00
Dianne Skoll	f7a8122cef	Document --version	2023-09-25 12:41:57 -04:00
Dianne Skoll	77d9bbb7d6	Add FILES section to man page.	2023-09-25 09:43:06 -04:00
Dianne Skoll	623def52fd	Add MAILING LIST section.	2023-09-25 09:38:07 -04:00
Dianne Skoll	d088e35142	Add bug-reporting email address.	2023-09-25 09:37:12 -04:00
Dianne Skoll	5821e55eb8	Add (1) to remind(1) in SEE ALSO section.	2023-09-25 08:28:24 -04:00
Dianne Skoll	1ee989c65d	Add example for null date specification.	2023-09-25 08:27:22 -04:00
Dianne Skoll	62388fb21f	Add "--version" long option.	2023-09-25 08:23:28 -04:00
Dianne Skoll	13571f84af	Fix typo in man page source (found by Dan Jacobson)	2023-09-25 08:15:14 -04:00
Dianne Skoll	03fdc06b65	Make AT optional: If we encounter a TIME, then implicitly start an AT clause.	2023-09-18 12:59:00 -04:00
Dianne Skoll	4bce675ae6	Update remind-conf-mode.el per Bill Benedetto	2023-09-13 18:40:13 -04:00
Dianne Skoll	e268bbf31d	Bump version to 04.02.06	2023-09-12 14:38:14 -04:00
Dianne Skoll	5863404de6	Document that MAYBE-UNCOMPUTABLE can be abbreviated to MAYBE.	2023-09-07 16:03:12 -04:00
Dianne Skoll	2de5996f4e	Update man page.	2023-08-17 09:35:55 -04:00
Dianne Skoll	695e79602a	Add Irish holidays in include/holidays/ie.rem Courtesy of Amy de Buitléir.	2023-07-26 16:02:21 -04:00
Dianne Skoll	cf0d958da5	Add optional "step" parameter to slide() to match nonomitted().	2023-07-23 14:43:13 -04:00
Dianne Skoll	85b0348fa7	Add $ParseUntriggered system variable.	2023-07-20 09:21:37 -04:00
Dianne Skoll	15a5d9a876	Simplify since() example.	2023-07-19 10:19:55 -04:00
Dianne Skoll	1baa6dab0c	Updates to nomomitted: o Add optional "step" argument o If start > end, swap the first two arguments o Update man page and tests	2023-07-15 13:04:47 -04:00
Dianne Skoll	34bb250ba3	Fix documentation accuracy.	2023-06-27 09:46:40 -04:00
Dianne Skoll	598b1b7464	Better documentation of %"...%" interaction with "-ca".	2023-06-11 14:08:22 -04:00
Dianne Skoll	e63d4be4e8	Make "-tn" explicitly set a delta of ++n for all REM statements. Also change the name of $DeltaOffset to $DeltaOverride.	2023-06-03 13:36:58 -04:00
Dianne Skoll	65561e7f34	Add "-tz" option to suppress all deltas. Document -tn better.	2023-05-21 20:14:07 -04:00
Dianne Skoll	da31dadb71	Correct Italian localizatio; patch courtesy of Emanuele Torre	2023-04-18 16:07:10 -04:00
Dianne Skoll	705adbb82a	Update release notes for 04.02.05.	2023-04-11 08:25:54 -04:00
Dianne Skoll	269f9788b6	Bump version to 04.02.05.	2023-04-11 08:22:10 -04:00
Dianne Skoll	5e1c5ae384	Diagnose common error.	2023-04-10 08:51:25 -04:00
Dianne Skoll	562eb83bde	SIGH Fix ADDOMIT/SATISFY bug. This was fixed for normal mode in commit `dedb9766c9` but was not fixed in calendar mode.	2023-04-09 10:44:34 -04:00
Dianne Skoll	a53db00243	Don't bother checking for sys/file.h because nothing includes it.	2023-03-19 09:47:12 -04:00
Dianne Skoll	11375729db	Remove unnecessary #include.	2023-03-19 09:43:57 -04:00
Dianne Skoll	9fee354e6c	Update release notes.	2023-03-15 18:46:30 -04:00
Dianne Skoll	ec76554d41	Treat a null -k option as no -k option	2023-03-15 09:22:44 -04:00
Dianne Skoll	ddb0817c99	Make an empty -k option the same as no -k option.	2023-03-15 09:17:02 -04:00
Dianne Skoll	3d6ecd1f72	Prep for 04.02.04 release.	2023-03-14 12:03:00 -04:00
Dianne Skoll	e3ec6565e9	Add support for -k: option --- applies command only to queued reminders.	2023-03-13 15:16:24 -04:00
Dianne Skoll	8ed49ead7f	Document that SPECIAL [type] means the same thing as [type] for type in MSG, MSF, RUN, CAL, PS and PSFILE.	2023-03-12 18:51:41 -04:00
Dianne Skoll	49fbca416f	Fix typo	2023-03-08 16:06:33 -05:00
Dianne Skoll	82cd438fff	Use -y as shorthand for --wrap.	2023-03-08 14:27:43 -05:00
Dianne Skoll	946e1bca38	Update help text to include --wrap, -x option.	2023-03-08 14:14:53 -05:00
Dianne Skoll	e40c81b5bf	Add the "--wrap, -x" command-line parameter to rem2pdf This "wraps" calendars that would normally require 6 rows so they only require 5. It does this by putting the last day or two in the first row rather than the last.	2023-03-08 13:39:49 -05:00
Dianne Skoll	f23418480d	Set up explict (row, col) -> Day mapping This will make it easier to eventually implement a calendar-wrapping feature that will avoid ever having to use 6 rows to display the calendar.	2023-03-08 10:42:15 -05:00
Dianne Skoll	bb4df39c50	Add note to defs.rem about US holidays.	2023-03-08 09:25:29 -05:00
Dianne Skoll	5fec775863	Better DST rules.	2023-03-07 18:34:53 -05:00
Dianne Skoll	a85980fec2	Add rules for moving US federal holidays if they fall on a weekend.	2023-03-07 18:31:58 -05:00
Dianne Skoll	f3ea2962e6	Remove unused function definition.	2023-03-07 16:40:53 -05:00
Dianne Skoll	3a5af23ab6	Fix Thanksgiving definition.	2023-03-07 16:37:17 -05:00
Dianne Skoll	f9656edc51	Make "SPECIAL MSG" the same as "MSG" and same for MSF, RUN, PS and PSFILE This lets us use variables to set the type of a REM command: SET t "MSG" REM SPECIAL [t] A message SET t "CAL" REM SPECIAL [t] A calendar message SET t "RUN" REM SPECIAL [t] /bin/some_cmd	2023-03-03 11:53:45 -05:00
Dianne Skoll	5134b47d47	Oops! Fix up broken tests.	2023-03-02 11:42:54 -05:00
Dianne Skoll	d4a183f3bf	Add htmlstriptags function.	2023-03-02 11:40:03 -05:00
Dianne Skoll	87e392de6c	Check for E_NOMEM conditions.	2023-03-02 09:43:56 -05:00
Dianne Skoll	afc1667e64	Implement htmlescape() built-in function.	2023-03-02 09:39:14 -05:00
Dianne Skoll	8d25270c43	Fix syntax of TkRemind command-line per Ian! D. Allen.	2023-03-02 08:39:14 -05:00
Dianne Skoll	929866a770	Use ^A as the split character rather than \	2023-02-27 12:13:19 -05:00
Dianne Skoll	395bad96a7	Don't barf if -underlinefg is not available; don't lose whitespace in MOON message.	2023-02-27 10:40:59 -05:00
Dianne Skoll	cd7be006c9	Set timezone for tests so moon phases show up on predictable days.	2023-02-23 08:32:24 -05:00
Dianne Skoll	f658ba7ee7	Fix typo, pointed out by @jochensp	2023-02-22 16:18:21 -05:00
Dianne Skoll	7416f4c035	Output a diff of test.out and test.cmp if tests fail, but limit to 200 lines.	2023-02-22 16:04:17 -05:00
Dianne Skoll	2860159ff7	Add test for a fixed bug.	2023-02-22 10:02:18 -05:00
Dianne Skoll	64fa71ab09	Avoid segfault if we define a function on the command-line with -i	2023-02-22 09:57:09 -05:00
Dianne Skoll	ffbba7d4d1	Update WHATSNEW for 04.02.03 release.	2023-02-10 12:57:53 -05:00
Dianne Skoll	fdcc2d8acf	Bump version to 04.02.03.	2023-02-09 09:31:28 -05:00
Dianne Skoll	f1aa4d16af	Test for v == INT_MIN on entry to FAbs.	2023-02-09 08:51:20 -05:00
Dianne Skoll	a55c5580f3	Silence Perl::Critic warning.	2023-02-07 13:45:38 -05:00
Dianne Skoll	569e315306	Suppress some Perl::Critic warnings.	2023-02-07 13:45:08 -05:00
Dianne Skoll	acd641845d	Update WHATSNEW	2023-02-07 13:07:54 -05:00
Dianne Skoll	6b7e6f6788	Another cppcheck cleanup.	2023-02-07 11:20:09 -05:00
Dianne Skoll	4248b9c624	Add "cppcheck" Makefile target.	2023-02-07 11:16:29 -05:00
Dianne Skoll	6de98d1357	A few more cppcheck cleanups.	2023-02-07 11:05:16 -05:00
Dianne Skoll	18f21693af	Clean up some warnings from cppcheck static analyzer.	2023-02-07 10:28:02 -05:00
Dianne Skoll	6fa500a860	Issue sort-banner correctly for MSF-type reminders.	2023-02-02 14:45:54 -05:00
Dianne Skoll	941c02582e	More details on TIME type, courtesy of Ian! D. Allen	2023-01-20 12:58:28 -05:00
Dianne Skoll	e56e3924d9	Clarify DURATION.	2023-01-20 12:33:14 -05:00
Dianne Skoll	d1384a8f69	Add #include <fcntl.h> to funcs.c. Reported by Zoltan Puskas; see https://bugs.gentoo.org/889318	2023-01-20 08:15:30 -05:00
Dianne Skoll	0488d689aa	Update tax day in include/holidays/us.rem	2023-01-19 13:15:50 -05:00